7u79-3: add major version delimiter in bundled .desktop's

2 files changed, 9 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed42bcc12198..69cfe72ab54d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bin32-jre7
 	pkgdesc = Oracle Java 7 Runtime Environment (32-bit) (public release - end of support)
 	pkgver = 7u79
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html
 	install = bin32-jre7.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 64db5b00eb96..2df4f248144d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _major=7
 _minor=79
 _build=b15
 pkgver=${_major}u${_minor}
-pkgrel=2
+pkgrel=3
 pkgdesc="Oracle Java $_major Runtime Environment (32-bit) (public release - end of support)"
 arch=('x86_64')
 url='http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html'
@@ -80,8 +80,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/*