diff --git a/files/fop.conf b/files/fop.conf --- a/files/fop.conf +++ b/files/fop.conf @@ -1,4 +1,4 @@ -JAVACMD="/usr/lib64/openjdk-8/bin/java" +JAVACMD="/usr/lib64/openjdk-11/bin/java" FOP_HOME="/usr/share/java/fop" CLASSPATH="$FOP_HOME/fop.jar" diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : fop -version : 2.4 -release : 2 +version : '2.5' +release : 3 source : - - http://apache.dattatec.com/xmlgraphics/fop/source/fop-2.4-src.tar.gz : 1d6b323b1c4968a492a234ba1b726e78c96b91cfd871f77cb579d68729443086 + - https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.5-src.tar.gz : 783077318139d581d5f485566d1b08bfc576003c53cfbf5beaeba503a24b4005 license : Apache-2.0 homepage : https://xmlgraphics.apache.org/fop/ component : programming.java @@ -15,9 +15,9 @@ builddeps : - apache-maven rundeps : - - openjdk-8 + - openjdk-11 build : | - export JAVA_HOME=/usr/lib64/openjdk-8 + export JAVA_HOME=/usr/lib64/openjdk-11 mkdir -p fop-events/target/test-classes mvn -DdistributionTargetDir=$installdir/usr/share/java -Dmaven.repo.local=../local-repo -DskipTests clean install -T%YJOBS% install : | @@ -26,6 +26,6 @@ install -Dm00644 fop/lib/commons-logging*.jar $installdir/usr/share/java/commons-logging.jar install -Dm00644 fop/lib/batik-all*.jar $installdir/usr/share/java/batik-all.jar install -Dm00644 fop/lib/xml-apis-ext*.jar $installdir/usr/share/java/xml-apis-ext.jar - install -Dm00644 fop/target/fop-2.4.jar $installdir/usr/share/java/fop/fop.jar + install -Dm00644 fop/target/fop-$version.jar $installdir/usr/share/java/fop/fop.jar install -Dm00644 $pkgfiles/fop.conf $installdir/etc/fop.conf install -Dm00755 fop/fop $installdir/usr/bin/fop diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -35,12 +35,12 @@ - - 2020-04-13 - 2.4 + + 2020-06-08 + 2.5 Packaging update Martin Reboredo gc1000ll@gmail.com \ No newline at end of file