summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD11
-rw-r--r--zlib-ng.conf1
3 files changed, 7 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 945432122680..31030caa8edc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = zlib-ng-git
pkgdesc = zlib replacement with optimizations for "next generation" systems
- pkgver = 1.9.9
+ pkgver = 1
pkgrel = 1
- epoch = 2
+ epoch = 3
url = https://github.com/zlib-ng/zlib-ng
arch = any
license = custom
@@ -11,12 +11,11 @@ pkgbase = zlib-ng-git
depends = glibc
provides = zlib=1.2.11
provides = zlib-ng=1.9.9
+ conflicts = zlib
conflicts = zlib-ng
options = staticlibs
source = git+https://github.com/zlib-ng/zlib-ng.git
- source = zlib-ng.conf
b2sums = SKIP
- b2sums = bf6eb01985db45c6b209a981aa5dbb97c9533fac960cd92ad9aee2d7926f0ec0e133f7df65901ced722fc51bdb362c6bfa3442c8d023db079b6636d109856071
pkgname = zlib-ng-git
diff --git a/PKGBUILD b/PKGBUILD
index 504e7cb3b6f6..1e8c13b3da7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
# Maintainer: Diab Neiroukh <officiallazerl0rd@gmail.com>
pkgname="zlib-ng-git"
-pkgver=1.9.9
+pkgver=1
pkgrel=1
-epoch=2
+epoch=3
pkgdesc="zlib replacement with optimizations for \"next generation\" systems"
arch=(
"any"
@@ -24,6 +24,7 @@ provides=(
"zlib-ng=1.9.9"
)
conflicts=(
+ "zlib"
"zlib-ng"
)
options=(
@@ -31,17 +32,15 @@ options=(
)
source=(
"git+${url}.git"
- "zlib-ng.conf"
)
b2sums=(
"SKIP"
- "bf6eb01985db45c6b209a981aa5dbb97c9533fac960cd92ad9aee2d7926f0ec0e133f7df65901ced722fc51bdb362c6bfa3442c8d023db079b6636d109856071"
)
build()
{
cd "zlib-ng" || exit
- ./configure --prefix="/opt/zlib-ng" --zlib-compat
+ ./configure --prefix="/usr" --zlib-compat
make
}
@@ -53,8 +52,6 @@ check()
package()
{
- install -D -m644 "zlib-ng.conf" "${pkgdir}/etc/ld.so.conf.d/zlib-ng.conf"
-
cd "zlib-ng" || exit
make install DESTDIR="${pkgdir}"
diff --git a/zlib-ng.conf b/zlib-ng.conf
deleted file mode 100644
index 9a7cd8c15ff0..000000000000
--- a/zlib-ng.conf
+++ /dev/null
@@ -1 +0,0 @@
-/opt/zlib-ng/lib