summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-12-22 10:27:36 +0000
committerDaniel Bermond2018-12-22 10:27:36 +0000
commit944b8c707bad6fd2060301f29a8ad9ab06cd8ca0 (patch)
treeb9fd792bfa1af4d888f6c63096c0e5538ce1fda2
parenta19ae6a2f60288d053c56a54d00d22e38c02a04b (diff)
downloadaur-944b8c707bad6fd2060301f29a8ad9ab06cd8ca0.tar.gz
Avoid conflicting desktop files
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f37d675603f..8f4ea3d95d76 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = jdk
pkgdesc = Oracle Java Development Kit
pkgver = 11.0.1
- pkgrel = 2
+ pkgrel = 3
url = https://www.oracle.com/java/
install = jdk.install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 52e8402f91bb..be816ea8e876 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _build=13
_hash=90cf5d8f270a4347a95050320eef3fb7
_majver="${pkgver%%.*}"
_next="$((_majver + 1))"
-pkgrel=2
+pkgrel=3
pkgdesc='Oracle Java Development Kit'
arch=('x86_64')
url='https://www.oracle.com/java/'
@@ -55,9 +55,9 @@ package() {
install -D -m644 lib/src.zip -t "${pkgdir}/${_jvmdir}/lib"
# desktop and icons
- install -D -m644 "${srcdir}/java.desktop" -t "${pkgdir}/usr/share/applications"
- install -D -m644 "${srcdir}/jconsole.desktop" -t "${pkgdir}/usr/share/applications"
- install -D -m644 "${srcdir}/jshell.desktop" -t "${pkgdir}/usr/share/applications"
+ install -D -m644 "${srcdir}/java.desktop" "${pkgdir}/usr/share/applications/java-java${_majver}-jdk.desktop"
+ install -D -m644 "${srcdir}/jconsole.desktop" "${pkgdir}/usr/share/applications/jconsole-java${_majver}-jdk.desktop"
+ install -D -m644 "${srcdir}/jshell.desktop" "${pkgdir}/usr/share/applications/jshell-java${_majver}-jdk.desktop"
install -D -m644 "${srcdir}/java_16.png" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/java${_majver}-jdk.png"
install -D -m644 "${srcdir}/java_48.png" "${pkgdir}/usr/share/icons/hicolor/48x48/apps/java${_majver}-jdk.png"