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

2 files changed, 9 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca01c9f82024..d47c3dc393b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bin32-jre6
 	pkgdesc = Oracle Java 6 Runtime Environment (32-bit) (public release - end of support)
 	pkgver = 6u45
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.java.com/en/download/faq/java_6.xml
 	install = bin32-jre6.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index b6b4982d64d9..5482c24d4762 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ _major=6
 _minor=45
 _build=b06
 pkgver=${_major}u${_minor}
-pkgrel=4
+pkgrel=5
 pkgdesc="Oracle Java $_major Runtime Environment (32-bit) (public release - end of support)"
 arch=('x86_64')
 url="https://www.java.com/en/download/faq/java_$_major.xml"
@@ -91,8 +91,13 @@ package() {
         rename -- "." "32-$_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|Name=.*|& (32-bit)|" \
+        -e "s|Comment=Java|Comment=Java $_major|" \
+        -e "s|Comment=.*|& (32-bit)|" \
+        -e "s|Exec=|&$_jvmdir/bin/|" \
         -e "s|.png|32-$_jname.png|" \
     -i lib/desktop/applications/*