6u45-4: add major version delimiter in bundled .desktop's

2 files changed, 7 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8dd55010dcce..d62df30b4e1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jre6
 	pkgdesc = Oracle Java 6 Runtime Environment (public release - end of support)
 	pkgver = 6u45
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.java.com/en/download/faq/java_6.xml
 	install = jre6.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 5404bd51de8b..5af17ed6e21a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _major=6
 _minor=45
 _build=b06
 pkgver=${_major}u${_minor}
-pkgrel=3
+pkgrel=4
 pkgdesc="Oracle Java $_major Runtime Environment (public release - end of support)"
 arch=('i686' 'x86_64')
 url="https://www.java.com/en/download/faq/java_$_major.xml"
@@ -94,8 +94,11 @@ package() {
         rename -- "." "-$_jname." $i
     done
 
-    # Fix .desktop paths
-    sed -e "s|Exec=|&$_jvmdir/bin/|" \
+    # Fix .desktop's
+    sed -e '/JavaWS/!s|Name=Java|Name=Java '"$_major"'|' \
+        -e "s|Name=JavaWS|Name=JavaWS $_major|" \
+        -e "s|Comment=Java|Comment=Java $_major|" \
+        -e "s|Exec=|&$_jvmdir/bin/|" \
         -e "s|.png|-$_jname.png|" \
     -i lib/desktop/applications/*