summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2016-02-03 21:59:43 +0200
committerDet2016-02-03 21:59:43 +0200
commitd0092cc3283ceead5436f556d9dbe6ff25993809 (patch)
tree2503a719b2154efabf954c701b33edb0fe30ce1d
parent90d29c2cf8ae8dd50859a0af8a204d2d2f457acd (diff)
downloadaur-d0092cc3283ceead5436f556d9dbe6ff25993809.tar.gz
6u45-5: add major version delimiter in bundled .desktop's
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD11
2 files changed, 9 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 576b2ee5b48..32471b8a53b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bin32-jdk6
pkgdesc = Oracle Java 6 Development Kit (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-jdk6.install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index ab99daea945..4d71ea7f25e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _major=6
_minor=45
_build=b06
pkgver=${_major}u${_minor}
-pkgrel=4
+pkgrel=5
pkgdesc="Oracle Java $_major Development Kit (32-bit) (public release - end of support)"
arch=('x86_64')
url="https://www.java.com/en/download/faq/java_$_major.xml"
@@ -107,8 +107,13 @@ package() {
rename -- "." "32-$_jname." $i
done
- # Fix .desktop paths
- sed -e "s|Exec=|&$_jvmdir/jre/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/jre/bin/|" \
-e "s|.png|32-$_jname.png|" \
-i jre/lib/desktop/applications/*