upgpkg: zlib-ng 2.0.6-2

2 files changed, 30 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7fca6c1eaa5a..300c65cc77f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,15 @@
 pkgbase = zlib-ng
-	pkgdesc = zlib replacement with optimizations for "next generation" systems
+	pkgdesc = zlib replacement with optimizations for 'next generation' systems
 	pkgver = 2.0.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/zlib-ng/zlib-ng
 	arch = i686
 	arch = x86_64
-	arch = arm
-	arch = armv6h
-	arch = armv7h
-	arch = aarch64
-	license = zlib
+	license = custom:zlib
 	makedepends = cmake
 	depends = glibc
-	provides = zlib=1.2.11
-	conflicts = zlib
-	source = https://github.com/zlib-ng/zlib-ng/archive/2.0.6.zip
-	sha256sums = cb8af7677e5f3bd9e56a6b1c384d9c17bf3d44aeb3c0523453f00772185b337a
+	options = staticlibs
+	source = zlib-ng-2.0.6-src.tar.gz::https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.0.6.tar.gz
+	sha256sums = 8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6
 
 pkgname = zlib-ng
diff --git a/PKGBUILD b/PKGBUILD
index c0c0fb24d7d4..896c6e2d0722 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,41 @@
-# Maintainer: Jacek Szafarkiewicz <szafar at linux dot pl>
+# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
+# Previous maintainer: Jacek Szafarkiewicz <szafar at linux dot pl>
 
 pkgname=zlib-ng
 pkgver=2.0.6
-pkgrel=1
-pkgdesc="zlib replacement with optimizations for \"next generation\" systems"
-arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
+pkgrel=2
+pkgdesc="zlib replacement with optimizations for 'next generation' systems"
+arch=('i686' 'x86_64')
 url="https://github.com/zlib-ng/zlib-ng"
-license=('zlib')
-
+license=('custom:zlib')
 depends=('glibc')
 makedepends=('cmake')
+options=('staticlibs')
+source=("$pkgname-$pkgver-src.tar.gz::https://github.com/zlib-ng/zlib-ng/archive/refs/tags/$pkgver.tar.gz")
+sha256sums=('8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6')
 
-provides=('zlib=1.2.11')
-conflicts=('zlib')
-
-source=("https://github.com/zlib-ng/zlib-ng/archive/${pkgver//_/-}.zip")
-sha256sums=('cb8af7677e5f3bd9e56a6b1c384d9c17bf3d44aeb3c0523453f00772185b337a')
 
 build() {
-    cmake \
-         -S "zlib-ng-${pkgver//_/-}" \
-         -B build \
-         -Wno-dev \
-         -DCMAKE_BUILD_TYPE=Release \
-         -DCMAKE_INSTALL_PREFIX=/usr \
-         -DZLIB_COMPAT=ON
-
-    make -C build
+  cd "$pkgname-$pkgver"
+
+  cmake \
+    -B "_build" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_INSTALL_LIBDIR="lib" \
+    ./
+  make -C "_build"
 }
 
 check() {
-    make -C build \
-        test
+  cd "$pkgname-$pkgver"
+
+  make -C "_build" test
 }
 
 package() {
-    make -C build \
-        install \
-        DESTDIR="$pkgdir" \
+  cd "$pkgname-$pkgver"
 
-    install -D -m644 "zlib-ng-${pkgver//_/-}/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  make -C "_build" DESTDIR="$pkgdir" install
+  install -Dm644 "LICENSE.md" -t "$pkgdir/usr/share/licenses/zlib-ng"
 }