summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBuildTools2019-12-17 15:42:06 -0500
committerBuildTools2019-12-17 15:42:06 -0500
commit509b1bc2a5bc08c1d990c7b1c304b6d1c6f6e4ac (patch)
treef2c0bb3638fce4724b4292b97411aa1b53d45549
parentd6a4abd0cdc9b15482d38c13b78bc7857ae662a6 (diff)
downloadaur-509b1bc2a5bc08c1d990c7b1c304b6d1c6f6e4ac.tar.gz
1.1.19
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD21
-rw-r--r--commons.patch14
3 files changed, 35 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 70bba4a9e426..ab188e9031ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = 389-console
pkgdesc = A Java based remote management console used for managing 389 Administration Server and 389 Directory Server.
- pkgver = 1.1.18
+ pkgver = 1.1.19
pkgrel = 1
url = http://port389.org
arch = any
@@ -10,8 +10,10 @@ pkgbase = 389-console
depends = bash
depends = idm-console-framework
depends = java-environment
- source = https://fedorapeople.org/groups/389ds/binaries/389-console-1.1.18.tar.bz2
- sha1sums = ad6929bc9391d7b725aa8246fce5cc22225829b3
+ source = https://releases.pagure.org/389-console/389-console-1.1.19.tar.bz2
+ source = commons.patch
+ sha256sums = 974ede78f3023b8292ed9599cafdae878b811bdc6dfa6e1a201f43391d1a979b
+ sha256sums = 710426750971db777d9dc1cfcb0b0f9ba3136409dbff9c4bd8da54c722780c39
pkgname = 389-console
diff --git a/PKGBUILD b/PKGBUILD
index 53058eb27f0e..adc67a5a75ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: WorMzy Tykashi <wormzy.tykashi@gmail.com>
+# Maintainer: Jameson Pugh <imntreal@gmail.com>
+# Contributor: WorMzy Tykashi <wormzy.tykashi@gmail.com>
# Contributor: jorge_barroso <jorge.barroso.11@gmail.com>
# Contributor: Yonathan Dossow <ydossow@archlinux.cl>
pkgname=389-console
-pkgver=1.1.18
+pkgver=1.1.19
pkgrel=1
pkgdesc="A Java based remote management console used for managing 389 Administration Server and 389 Directory Server."
arch=('any')
@@ -10,12 +11,22 @@ url="http://port389.org"
license=('GPL')
depends=('which' 'bash' 'idm-console-framework' 'java-environment')
makedepends=('apache-ant')
-source=(https://fedorapeople.org/groups/389ds/binaries/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ad6929bc9391d7b725aa8246fce5cc22225829b3')
+source=("https://releases.pagure.org/389-console/${pkgname}-${pkgver}.tar.bz2"
+ 'commons.patch')
+sha256sums=('974ede78f3023b8292ed9599cafdae878b811bdc6dfa6e1a201f43391d1a979b'
+ '710426750971db777d9dc1cfcb0b0f9ba3136409dbff9c4bd8da54c722780c39')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch < ../commons.patch
+}
build() {
cd ${pkgname}-${pkgver}
- /usr/share/apache-ant/bin/ant -Dbuilt.dir="built"
+ ant -Dbuilt.dir="built" \
+ -Djss.local.location=/usr/share/java \
+ -Dapache.codec.local.location=/usr/share/java/commons-codec \
+ -Dapache.lang.local.location=/usr/share/java/commons-lang
}
package() {
diff --git a/commons.patch b/commons.patch
new file mode 100644
index 000000000000..a0f0caf280ac
--- /dev/null
+++ b/commons.patch
@@ -0,0 +1,14 @@
+diff -u build.properties.orig build.properties
+--- build.properties.orig 2019-02-12 08:56:58.470228310 -0500
++++ build.properties 2019-02-12 08:57:14.990665433 -0500
+@@ -34,8 +34,8 @@
+ console.mcc.name=idm-console-mcc
+ console.nmclf.name=idm-console-nmclf
+
+-apache.codec.jar.name=apache-commons-codec.jar
+-apache.lang.jar.name=apache-commons-lang.jar
++apache.codec.jar.name=commons-codec.jar
++apache.lang.jar.name=commons-lang.jar
+ jss.jar.name=jss4.jar
+ ldapjdk.jar.name=ldapjdk.jar
+ slf4j.jar.name=slf4j-api.jar