fop-2.2-1.parabola1: updating version

1 files changed, 21 insertions, 30 deletions

diff --git a/libre/fop/PKGBUILD b/libre/fop/PKGBUILD
index a6a224458..cafd7fc36 100644
--- a/libre/fop/PKGBUILD
+++ b/libre/fop/PKGBUILD
@@ -4,41 +4,32 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=fop
-pkgver=2.1
+pkgver=2.2
 pkgrel=1.parabola1
 pkgdesc='XSL-FO implementation in Java.'
 arch=('any')
 url='http://xmlgraphics.apache.org/fop/'
 license=('APACHE')
 depends=('java-xmlgraphics-commons' 'java-commons-logging' 'java-commons-io' 'java-batik'
-         'java-avalon-framework' 'java-qdox' 'fontbox' 'tomcat8' 'openicc')
+         'java-avalon-framework' 'java-qdox' 'fontbox' 'tomcat8')
 makedepends=('apache-ant' 'jh')
 source=("http://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/xmlgraphics/$pkgname/source/$pkgname-$pkgver-src.tar.gz"
-        "https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/${pkgname}/${pkgver}/${pkgname}-${pkgver}.pom"
-        'fop.conf'
-        'fop-fix_build.patch'
-        'fop-replace_sRGB_profile.patch')
-md5sums=('13b5b497dfb0ba8a01093dfc1a89d106'
-         '38ec8e97c4dc787e99dcbba94b0e17d2'
-         '3dc3325bf77afc787024f33e7d6ab99e'
-         '5b720bb6f3c29673ae30679a19a41a4b'
-         '7a5224d08d29ff343ffd7c889156fef9')
+        'fop.conf')
+sha256sums=('5052fef87fc4b888bd49d29bf626255c9d3443b628f21393c11ea121d44a6552'
+            'd2900605dc271f5938d0820ca30bdec8060724976b56e43d827157bd6975da96')
 backup=('etc/fop.conf')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver/fop"
   rm -rv lib/*
-  rm -v "src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm"{,.LICENSE.txt}
   mkdir -p lib/build
 
-  patch -Np1 -i "${srcdir}/fop-fix_build.patch"
-  patch -Np1 -i "${srcdir}/fop-replace_sRGB_profile.patch"
   ln -sf /usr/share/java/qdox.jar lib/build/qdox.jar
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ant package javadocs \
+  ant -f "$pkgname/build.xml" package \
     -lib /usr/share/java/serializer.jar \
     -lib /usr/share/java/xmlgraphics-commons.jar \
     -lib /usr/share/java/avalon-framework-api.jar \
@@ -55,25 +46,25 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # Install license file
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
 
   # Install documentation
-  install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r "build/javadocs" "${pkgdir}/usr/share/doc/${pkgname}"
+  #install -d "$pkgdir/usr/share/doc/$pkgname"
+  #cp -r build/javadocs "$pkgdir/usr/share/doc/$pkgname"
 
   # Install Maven artifacts
-  export DESTDIR=${pkgdir}
-  jh mvn-install "org.apache.xmlgraphics" ${pkgname} ${pkgver} \
-    "${srcdir}/${pkgname}-${pkgver}.pom" \
-    "build/${pkgname}.jar" \
-    "${pkgname}-${pkgver}.jar"
-  ln -s "/usr/share/java/${pkgname}-${pkgver}.jar" \
-    "${pkgdir}/usr/share/java/${pkgname}.jar"
+  export DESTDIR=$pkgdir
+  jh mvn-install org.apache.xmlgraphics $pkgname $pkgver \
+    "$pkgname/pom.xml" \
+    "$pkgname/build/$pkgname.jar" \
+    "$pkgname-$pkgver.jar"
+  ln -s "/usr/share/java/$pkgname-$pkgver.jar" \
+    "$pkgdir/usr/share/java/$pkgname.jar"
 
-  install -d "${pkgdir}/usr/share/java/${pkgname}"
-  ln -s "/usr/share/java/${pkgname}.jar" \
-    "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
+  install -d "$pkgdir/usr/share/java/$pkgname"
+  ln -s "/usr/share/java/$pkgname.jar" \
+    "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
 
   install -Dm0644 "../fop.conf" "$pkgdir/etc/fop.conf"
-  install -Dm0755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
+  install -Dm0755 "$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
 }