summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2016-03-09 18:03:15 +0200
committerDet2016-03-09 18:03:15 +0200
commit89b26b99e6f54c4ff4e5f8a9ae8e482652a28d45 (patch)
tree3ff3a22ed6c55a1250816376f0923abcb78826ab
parentdffb3df3cc17e033f7f4e5cb2fade56fe3bd954f (diff)
downloadaur-89b26b99e6f54c4ff4e5f8a9ae8e482652a28d45.tar.gz
don't use architecture-dependent arrays + rm deprecated 'pacman>=4.2.0' requirement
-rw-r--r--.SRCINFO35
-rw-r--r--PKGBUILD15
2 files changed, 24 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3679e09965c..97e4fb6d7de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,6 +6,23 @@ pkgbase = bin32-jdk6
install = bin32-jdk6.install
arch = x86_64
license = custom
+ depends = ca-certificates-java
+ depends = desktop-file-utils
+ depends = hicolor-icon-theme
+ depends = java32-environment-common
+ depends = java32-runtime-common
+ depends = lib32-glibc
+ depends = lib32-libjpeg-turbo
+ depends = lib32-lcms2
+ depends = lib32-libxrender
+ depends = lib32-libxtst
+ depends = lib32-nss
+ depends = shared-mime-info
+ depends = xdg-utils
+ optdepends = eclipse: "Oracle Java Mission Control" plugins for Eclipse
+ optdepends = lib32-alsa-lib: for basic sound support
+ optdepends = lib32-gtk2: for Gtk+ look and feel (desktop)
+ optdepends = ttf-font: fonts
provides = java32-runtime=6
provides = java32-runtime-headless=6
provides = java32-web-start=6
@@ -44,24 +61,6 @@ pkgbase = bin32-jdk6
md5sums = eaaf5c10579336af3474ccb23dce2911
md5sums = 3adcb5783ffaa18c3480ddfa0569dce2
md5sums = 45c15a6b4767288f2f745598455ea2bf
- depends_x86_64 = ca-certificates-java
- depends_x86_64 = desktop-file-utils
- depends_x86_64 = hicolor-icon-theme
- depends_x86_64 = java32-environment-common
- depends_x86_64 = java32-runtime-common
- depends_x86_64 = lib32-glibc
- depends_x86_64 = lib32-libjpeg-turbo
- depends_x86_64 = lib32-lcms2
- depends_x86_64 = lib32-libxrender
- depends_x86_64 = lib32-libxtst
- depends_x86_64 = lib32-nss
- depends_x86_64 = shared-mime-info
- depends_x86_64 = xdg-utils
- optdepends_x86_64 = eclipse: "Oracle Java Mission Control" plugins for Eclipse
- optdepends_x86_64 = lib32-alsa-lib: for basic sound support
- optdepends_x86_64 = lib32-gtk2: for Gtk+ look and feel (desktop)
- optdepends_x86_64 = ttf-font: fonts
- makedepends_x86_64 = pacman>=4.2.0
pkgname = bin32-jdk6
diff --git a/PKGBUILD b/PKGBUILD
index 75065501674..edb9837c825 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,14 +12,13 @@ pkgdesc="Oracle Java $_major Development Kit (32-bit) (public release - end of s
arch=('x86_64')
url="https://www.java.com/en/download/faq/java_$_major.xml"
license=('custom')
-depends_x86_64=('ca-certificates-java' 'desktop-file-utils' 'hicolor-icon-theme' 'java32-environment-common'
- 'java32-runtime-common' 'lib32-glibc' 'lib32-libjpeg-turbo' 'lib32-lcms2' 'lib32-libxrender'
- 'lib32-libxtst' 'lib32-nss' 'shared-mime-info' 'xdg-utils')
-optdepends_x86_64=('eclipse: "Oracle Java Mission Control" plugins for Eclipse'
- 'lib32-alsa-lib: for basic sound support'
- 'lib32-gtk2: for Gtk+ look and feel (desktop)'
- 'ttf-font: fonts')
-makedepends_x86_64=('pacman>=4.2.0')
+depends=('ca-certificates-java' 'desktop-file-utils' 'hicolor-icon-theme' 'java32-environment-common'
+ 'java32-runtime-common' 'lib32-glibc' 'lib32-libjpeg-turbo' 'lib32-lcms2' 'lib32-libxrender'
+ 'lib32-libxtst' 'lib32-nss' 'shared-mime-info' 'xdg-utils')
+optdepends=('eclipse: "Oracle Java Mission Control" plugins for Eclipse'
+ 'lib32-alsa-lib: for basic sound support'
+ 'lib32-gtk2: for Gtk+ look and feel (desktop)'
+ 'ttf-font: fonts')
provides=("java32-runtime=$_major" "java32-runtime-headless=$_major" "java32-web-start=$_major" "java32-environment=$_major"
"java32-runtime-jre=$_major" "java32-runtime-headless-jre=$_major" "java32-web-start-jre=$_major" "java32-environment-jdk=$_major")