[arch-commits] Commit in zlib/repos (4 files)

[Pierre Schmitz]

    Date: Sunday, November 20, 2016 @ 10:37:52
  Author: pierre
Revision: 281668

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  zlib/repos/testing-i686/PKGBUILD
    (from rev 281667, zlib/trunk/PKGBUILD)
  zlib/repos/testing-x86_64/PKGBUILD
    (from rev 281667, zlib/trunk/PKGBUILD)
Deleted:
  zlib/repos/testing-i686/PKGBUILD
  zlib/repos/testing-x86_64/PKGBUILD

-------------------------+
 /PKGBUILD               |  118 ++++++++++++++++++++++++++++++++++++++++++++++
 testing-i686/PKGBUILD   |   38 --------------
 testing-x86_64/PKGBUILD |   38 --------------
 3 files changed, 118 insertions(+), 76 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2016-11-20 10:37:40 UTC (rev 281667)
+++ testing-i686/PKGBUILD	2016-11-20 10:37:52 UTC (rev 281668)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=zlib
-pkgver=1.2.8
-pkgrel=5
-pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.zlib.net/"
-depends=('glibc')
-options=('staticlibs')  # needed by binutils testsuite
-source=("http://zlib.net/zlib-${pkgver}.tar.gz"{,.asc})
-md5sums=('44d667c142d7cda120332623eab69f40'
-         'SKIP')
-validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA')
-
-prepare() {
-	cd ${srcdir}/zlib-$pkgver
-	grep -A 24 '^  Copyright' zlib.h > LICENSE
-}
-
-build() {
-	cd ${srcdir}/zlib-$pkgver
-	./configure --prefix=/usr
-	make
-}
-
-check() {
-	cd ${srcdir}/zlib-$pkgver
-	make test
-}
-
-package() {
-	cd ${srcdir}/zlib-$pkgver
-	make install DESTDIR=${pkgdir}
-	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE
-}

Copied: zlib/repos/testing-i686/PKGBUILD (from rev 281667, zlib/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2016-11-20 10:37:52 UTC (rev 281668)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=zlib
+pkgname=(zlib minizip)
+pkgver=1.2.8
+pkgrel=6
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://www.zlib.net/"
+depends=('glibc')
+options=('staticlibs')  # needed by binutils testsuite
+source=("http://zlib.net/zlib-${pkgver}.tar.gz"{,.asc})
+md5sums=('44d667c142d7cda120332623eab69f40'
+         'SKIP')
+validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA')
+
+prepare() {
+	cd ${srcdir}/zlib-$pkgver
+	grep -A 24 '^  Copyright' zlib.h > LICENSE
+}
+
+build() {
+	cd ${srcdir}/zlib-$pkgver
+	./configure --prefix=/usr
+	make
+
+	cd contrib/minizip
+	cp Makefile Makefile.orig
+	cp ../README.contrib readme.txt
+	autoreconf --install
+	./configure --prefix=/usr --enable-static=no
+	make
+}
+
+check() {
+	cd ${srcdir}/zlib-$pkgver
+	make test
+
+	cd contrib/minizip
+	make -f Makefile.orig test
+}
+
+package_zlib() {
+	pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
+
+	cd ${srcdir}/zlib-$pkgver
+	make install DESTDIR=${pkgdir}
+	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE
+}
+
+package_minizip() {
+	pkgdesc='Mini zip and unzip based on zlib'
+	depends=('zlib')
+
+	cd ${srcdir}/zlib-$pkgver/contrib/minizip
+	make install DESTDIR=${pkgdir}
+	install -D -m644 ${srcdir}/zlib-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/minizip/LICENSE
+}

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2016-11-20 10:37:40 UTC (rev 281667)
+++ testing-x86_64/PKGBUILD	2016-11-20 10:37:52 UTC (rev 281668)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=zlib
-pkgver=1.2.8
-pkgrel=5
-pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.zlib.net/"
-depends=('glibc')
-options=('staticlibs')  # needed by binutils testsuite
-source=("http://zlib.net/zlib-${pkgver}.tar.gz"{,.asc})
-md5sums=('44d667c142d7cda120332623eab69f40'
-         'SKIP')
-validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA')
-
-prepare() {
-	cd ${srcdir}/zlib-$pkgver
-	grep -A 24 '^  Copyright' zlib.h > LICENSE
-}
-
-build() {
-	cd ${srcdir}/zlib-$pkgver
-	./configure --prefix=/usr
-	make
-}
-
-check() {
-	cd ${srcdir}/zlib-$pkgver
-	make test
-}
-
-package() {
-	cd ${srcdir}/zlib-$pkgver
-	make install DESTDIR=${pkgdir}
-	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE
-}

Copied: zlib/repos/testing-x86_64/PKGBUILD (from rev 281667, zlib/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2016-11-20 10:37:52 UTC (rev 281668)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=zlib
+pkgname=(zlib minizip)
+pkgver=1.2.8
+pkgrel=6
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://www.zlib.net/"
+depends=('glibc')
+options=('staticlibs')  # needed by binutils testsuite
+source=("http://zlib.net/zlib-${pkgver}.tar.gz"{,.asc})
+md5sums=('44d667c142d7cda120332623eab69f40'
+         'SKIP')
+validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA')
+
+prepare() {
+	cd ${srcdir}/zlib-$pkgver
+	grep -A 24 '^  Copyright' zlib.h > LICENSE
+}
+
+build() {
+	cd ${srcdir}/zlib-$pkgver
+	./configure --prefix=/usr
+	make
+
+	cd contrib/minizip
+	cp Makefile Makefile.orig
+	cp ../README.contrib readme.txt
+	autoreconf --install
+	./configure --prefix=/usr --enable-static=no
+	make
+}
+
+check() {
+	cd ${srcdir}/zlib-$pkgver
+	make test
+
+	cd contrib/minizip
+	make -f Makefile.orig test
+}
+
+package_zlib() {
+	pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
+
+	cd ${srcdir}/zlib-$pkgver
+	make install DESTDIR=${pkgdir}
+	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE
+}
+
+package_minizip() {
+	pkgdesc='Mini zip and unzip based on zlib'
+	depends=('zlib')
+
+	cd ${srcdir}/zlib-$pkgver/contrib/minizip
+	make install DESTDIR=${pkgdir}
+	install -D -m644 ${srcdir}/zlib-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/minizip/LICENSE
+}