epubcheck: update to 4.1.1

2 files changed, 26 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1cb31d4fe291..e29f048e05e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = epubcheck
 	pkgdesc = A tool to validate epub files.
-	pkgver = 4.0.2
+	pkgver = 4.1.1
 	pkgrel = 1
 	url = https://github.com/IDPF/epubcheck
 	arch = any
 	license = BSD
-	makedepends = unzip
+	makedepends = maven
 	depends = java-environment
-	noextract = epubcheck-4.0.2.zip
+	source = epubcheck-4.1.1.tar.gz::https://github.com/w3c/epubcheck/archive/v4.1.1.tar.gz
 	source = epubcheck.1
-	source = https://github.com/IDPF/epubcheck/releases/download/v4.0.2/epubcheck-4.0.2.zip
+	sha512sums = e9bbe6c8fdb7b85b49da8d7eec6fa571a37ab0ec072a08a213ce1a341f6872d0872c1112879177bee3f64888c67dcc519e14a63cd2d866b9c72b5fd049da6ee5
 	sha512sums = f15527b6283053d3ae8e03679ed011b75b52e1d14b765a49565d17bb7d2aad785d57db477a692a3df89bfcacf80b03c7c98d652946d03ceb343edc48f40a635d
-	sha512sums = c6d87b6bf721120de439a4984282a9900bfc446d9471eb6eb1abba2ce5ff7d270fe2baac8022701e877ac339948f5f06c9a56cf87f881f3fa309e072a3536a2f
 
 pkgname = epubcheck
 
diff --git a/PKGBUILD b/PKGBUILD
index 70a2cd40eed4..ed11c911e6b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,39 @@
+# Maintainer: Andrew Sun <adsun701@gmail.com>
 # Contributor: James Thomas <notrevolution at gmail dot com>
+
 pkgname=epubcheck
-pkgver=4.0.2
+pkgver=4.1.1
 pkgrel=1
 pkgdesc="A tool to validate epub files."
 arch=('any')
 url="https://github.com/IDPF/epubcheck"
 license=('BSD')
 depends=('java-environment')
-makedepends=('unzip')
-source=("epubcheck.1" "https://github.com/IDPF/epubcheck/releases/download/v${pkgver}/${pkgname}-${pkgver}.zip")    
-noextract=("${pkgname}-${pkgver}.zip")
-sha512sums=('f15527b6283053d3ae8e03679ed011b75b52e1d14b765a49565d17bb7d2aad785d57db477a692a3df89bfcacf80b03c7c98d652946d03ceb343edc48f40a635d'
-            'c6d87b6bf721120de439a4984282a9900bfc446d9471eb6eb1abba2ce5ff7d270fe2baac8022701e877ac339948f5f06c9a56cf87f881f3fa309e072a3536a2f')
+makedepends=('maven')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/w3c/epubcheck/archive/v${pkgver}.tar.gz"
+        "epubcheck.1")
+sha512sums=('e9bbe6c8fdb7b85b49da8d7eec6fa571a37ab0ec072a08a213ce1a341f6872d0872c1112879177bee3f64888c67dcc519e14a63cd2d866b9c72b5fd049da6ee5'
+            'f15527b6283053d3ae8e03679ed011b75b52e1d14b765a49565d17bb7d2aad785d57db477a692a3df89bfcacf80b03c7c98d652946d03ceb343edc48f40a635d')
 
 build() {
-
-        cd $srcdir
-        unzip "${pkgname}-${pkgver}.zip"
-
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  mvn clean package -Dmaven.test.skip=true -Dmaven.repo.local="${srcdir}/${pkgname}-${pkgver}"
 }
             
 package() {
-    
-    install -d "$pkgdir/usr/share"/{java,docs,licenses}/"${pkgname}" "$pkgdir/usr/share/java/${pkgname}/lib"
-    install -m644 "$srcdir/${pkgname}-${pkgver}/epubcheck.jar" "$pkgdir/usr/share/java/${pkgname}/epubcheck.jar"    
-    install -m644 "$srcdir/${pkgname}-${pkgver}/lib"/*.jar "$pkgdir/usr/share/java/${pkgname}/lib"
-    install -m644 "$srcdir/${pkgname}-${pkgver}"/*.txt "$pkgdir/usr/share/docs/${pkgname}"
-    install -m644 "$srcdir/${pkgname}-${pkgver}/licenses/BSD-3-Clause.txt" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-    
-    install -D -m644 "$srcdir/epubcheck.1" "$pkgdir/usr/share/man/man1/epubcheck.1"
-    
-    mkdir -p "$pkgdir/usr/bin"
-    
-    cat >> "$pkgdir/usr/bin/${pkgname}" << EOF 
+  install -d "${pkgdir}/usr/share"/{java,docs,licenses}/"${pkgname}" "${pkgdir}/usr/share/java/${pkgname}/lib"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/target/epubcheck.jar" "${pkgdir}/usr/share/java/${pkgname}/epubcheck.jar"    
+  install -m644 "${srcdir}/${pkgname}-${pkgver}/target/lib"/*.jar "${pkgdir}/usr/share/java/${pkgname}/lib"
+  install -m644 "${srcdir}/${pkgname}-${pkgver}"/*.md "${pkgdir}/usr/share/docs/${pkgname}"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
+
+  install -Dm644 "${srcdir}/epubcheck.1" "${pkgdir}/usr/share/man/man1/epubcheck.1"
+
+  mkdir -p "$pkgdir/usr/bin"
+
+  cat >> "$pkgdir/usr/bin/${pkgname}" << EOF 
 #!/bin/bash
 exec /usr/bin/java -jar '/usr/share/java/epubcheck/epubcheck.jar' "\$@"
 EOF
-    chmod +x "$pkgdir/usr/bin/${pkgname}"
+  chmod 755 "${pkgdir}/usr/bin/${pkgname}"
 }
-
-