Alexander Rødseth pushed to branch main at Arch Linux / Packaging / Packages / 
fop


Commits:
f57cd4fc by Alexander F. Rødseth at 2024-10-23T13:26:59+02:00
upgpkg: 2.10-1

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,12 +1,12 @@
 pkgbase = fop
        pkgdesc = XSL-FO to PDF formatter
-       pkgver = 2.9
+       pkgver = 2.10
        pkgrel = 1
        url = https://xmlgraphics.apache.org/fop/
        arch = any
-       license = APACHE
+       license = Apache-2.0
        makedepends = apache-ant
-       makedepends = java-environment
+       makedepends = jdk8-openjdk
        makedepends = maven
        depends = java-avalon-framework
        depends = java-batik=1.17
@@ -14,9 +14,9 @@ pkgbase = fop
        depends = java-commons-logging
        depends = java-xmlgraphics-commons
        backup = etc/fop.conf
-       source = 
https://dlcdn.apache.org/xmlgraphics/fop/source/fop-2.9-src.tar.gz
+       source = 
https://dlcdn.apache.org/xmlgraphics/fop/source/fop-2.10-src.tar.gz
        source = fop.conf
-       b2sums = 
6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a
+       b2sums = 
5217edbabc255b2e37c6198ea7cdfb1344db0726c7156f73bdc5ac452c4c233c5280d263e65656cde92ce6aa52c8ea94e346d9d14535ca802fc37fe1475ba255
        b2sums = 
928ced5f2591d2537829d74ae94c6f59e1be2f12eddf44e2f7fe5fd06606e94a5911396d6ef8596137449524c9d0d13ef8896bc4fb5e58096bd9948708879857
 
 pkgname = fop


=====================================
PKGBUILD
=====================================
@@ -4,34 +4,35 @@
 # Contributor: Simon Lipp <[email protected]>
 
 pkgname=fop
-pkgver=2.9
+pkgver=2.10
 pkgrel=1
 pkgdesc='XSL-FO to PDF formatter'
 arch=(any)
 url='https://xmlgraphics.apache.org/fop/'
-license=(APACHE)
+license=(Apache-2.0)
 depends=(java-avalon-framework 'java-batik=1.17' java-commons-io 
java-commons-logging java-xmlgraphics-commons)
-makedepends=(apache-ant java-environment maven)
+makedepends=(apache-ant jdk8-openjdk maven)
 
source=("https://dlcdn.apache.org/xmlgraphics/$pkgname/source/$pkgname-$pkgver-src.tar.gz";
         fop.conf)
-b2sums=('6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a'
+b2sums=('5217edbabc255b2e37c6198ea7cdfb1344db0726c7156f73bdc5ac452c4c233c5280d263e65656cde92ce6aa52c8ea94e346d9d14535ca802fc37fe1475ba255'
         
'928ced5f2591d2537829d74ae94c6f59e1be2f12eddf44e2f7fe5fd06606e94a5911396d6ef8596137449524c9d0d13ef8896bc4fb5e58096bd9948708879857')
 backup=(etc/fop.conf)
 
 prepare() {
   cd $pkgname-$pkgver/$pkgname
-  cp -f "$srcdir/fop.conf" fop_modified.conf
-  pacman -Ql java-batik | grep \.jar | sed 's/java-batik 
/CLASSPATH="$CLASSPATH:/g;s/$/"/g' >> fop_modified.conf
+  cp -f "$srcdir/fop.conf" fop.conf
+  pacman -Ql java-batik | grep \.jar | sed 's/java-batik 
/CLASSPATH="$CLASSPATH:/g;s/$/"/g' >> fop.conf
 }
 
 build() {
+  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
   cd $pkgname-$pkgver
   ant -f $pkgname/build.xml package
 }
 
 package() {
   cd $pkgname-$pkgver/$pkgname
-  install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 build/fop.jar "$pkgdir/usr/share/java/fop/fop.jar"
-  install -Dm644 fop_modified.conf "$pkgdir/etc/fop.conf"
+  install -Dm755 -t "$pkgdir/usr/bin" $pkgname
+  install -Dm644 -t "$pkgdir/usr/share/java/fop" build/fop.jar
+  install -Dm644 -t "$pkgdir/etc" fop.conf
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/fop/-/commit/f57cd4fc97391380857e757a65d1fb38aa34bd4a

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/fop/-/commit/f57cd4fc97391380857e757a65d1fb38aa34bd4a
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to