Fix conf, legal and man symlinks

2 files changed, 14 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bac1f74cb2b..2b879b23a9ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,16 @@
 pkgbase = zulu-14-bin
 	pkgdesc = Zulu Community builds of OpenJDK are fully certified and 100% open source Java Development Kits (JDKs) for all Java development and production workloads.
 	pkgver = 14.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.azul.com/products/zulu-community/
 	install = zulu-14-bin.install
 	arch = x86_64
 	license = custom
-	depends = java-environment-common=3
+	depends = java-environment-common>=3
 	depends = java-runtime-common>=3
 	depends = ca-certificates-utils
-	depends = nss
-	depends = libjpeg-turbo
-	depends = lcms2
-	depends = libnet
-	depends = freetype2
-	depends = giflib
-	depends = hicolor-icon-theme
-	depends = libelf
 	provides = java-environment=14
 	provides = java-environment-openjdk=14
-	provides = java-runtime-headless=14
-	provides = java-runtime-headless-openjdk=14
 	provides = java-runtime=14
 	provides = java-runtime-openjdk=14
 	source = https://cdn.azul.com/zulu/bin/zulu14.29.23-ca-jdk14.0.2-linux_x64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index aeefaa15de1b..03fa5490c8a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,21 @@
 _jdkname=zulu-14
 pkgname="${_jdkname}-bin"
 _java_ver=14
-_zulu_build=14.29.23-ca
-pkgver=14.0.2
-pkgrel=1
+_zulu_build="${_java_ver}.29.23-ca"
+pkgver="${_java_ver}.0.2"
+pkgrel=2
 pkgdesc='Zulu Community builds of OpenJDK are fully certified and 100% open source Java Development Kits (JDKs) for all Java development and production workloads.'
 arch=('x86_64')
 url='https://www.azul.com/products/zulu-community/'
 license=('custom')
 depends=(
-  'java-environment-common=3' 'java-runtime-common>=3' 'ca-certificates-utils'
-  # not 100% sure if all of these dependencies are needed
-  # dependencies from jre13-openjdk-headless
-  'nss' 'libjpeg-turbo' 'lcms2' 'libnet' 'freetype2'
-  # dependencies from jre13-openjdk
-  'giflib'
-  # dependencies from java13-openjdk
-  'hicolor-icon-theme' 'libelf'
+  'java-environment-common>=3'
+  'java-runtime-common>=3'
+  'ca-certificates-utils'
 )
 provides=(
   "java-environment=$_java_ver"
   "java-environment-openjdk=$_java_ver"
-  "java-runtime-headless=$_java_ver"
-  "java-runtime-headless-openjdk=$_java_ver"
   "java-runtime=$_java_ver"
   "java-runtime-openjdk=$_java_ver"
 )
@@ -41,24 +34,28 @@ package() {
   install -dm 755 "${pkgdir}/${_jvmdir}"
   cp -a . "${pkgdir}/${_jvmdir}/"
 
-  # copied from java13-openjdk
+  # based on java-openjdk package_jdk-openjdk
+  # https://github.com/archlinux/svntogit-packages/blob/3f6aa8ddd98f728a9b0701288a933d16f0e8bbaf/trunk/PKGBUILD
 
   # Conf
   install -dm 755 "${pkgdir}/etc"
   cp -r conf "${pkgdir}/etc/${_jdkname}"
+  rm -r "${pkgdir}/${_jvmdir}/conf"
   ln -s "/etc/${_jdkname}" "${pkgdir}/${_jvmdir}/conf"
 
   # Legal
   install -dm 755 "${pkgdir}/usr/share/licenses"
   cp -r legal "${pkgdir}/usr/share/licenses/${_jdkname}"
+  rm -r "${pkgdir}/${_jvmdir}/legal"
   ln -s "/usr/share/licenses/${_jdkname}" "${pkgdir}/${_jvmdir}/legal"
 
   # Man pages
   for f in bin/*; do
     f=$(basename "${f}")
-    _man=../jdk/man/man1/"${f}.1"
+    _man=man/man1/"${f}.1"
     test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-${_jdkname}.1"
   done
+  rm -r "${pkgdir}/${_jvmdir}/man"
   ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
 
   # Link JKS keystore from ca-certificates-utils