[arch-commits] Commit in libzip/trunk (PKGBUILD fix-headers.patch)

[Andrea Scarpino]

    Date: Wednesday, May 4, 2011 @ 03:26:57
  Author: andrea
Revision: 122444

upgpkg: libzip 0.10-1
upstream release

Added:
  libzip/trunk/fix-headers.patch
Modified:
  libzip/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   18 +++++++++++-------
 fix-headers.patch |   15 +++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-04 07:04:53 UTC (rev 122443)
+++ PKGBUILD	2011-05-04 07:26:57 UTC (rev 122444)
@@ -3,7 +3,7 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=libzip
-pkgver=0.9.3
+pkgver=0.10
 pkgrel=1
 pkgdesc="A C library for reading, creating, and modifying zip archives"
 url="http://www.nih.at/libzip/index.html"
@@ -11,16 +11,20 @@
 arch=('i686' 'x86_64')
 depends=('zlib')
 options=('!libtool')
-source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e5fa5d0c5d2ad4c7a0c0fc7f5a1695b9')
+source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'fix-headers.patch')
+md5sums=('47cdfcbc08c8bea0b52fdee4bf591622'
+         '249395bd3a426c4c4e993e9d4753e1dd')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i "${srcdir}/fix-headers.patch"
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
 }

Added: fix-headers.patch
===================================================================
--- fix-headers.patch	                        (rev 0)
+++ fix-headers.patch	2011-05-04 07:26:57 UTC (rev 122444)
@@ -0,0 +1,15 @@
+diff -urN libzip-0.10rc1.old/lib/Makefile.am libzip-0.10rc1/lib/Makefile.am
+--- libzip-0.10rc1.old/lib/Makefile.am	2011-03-05 01:07:33.921722002 +0100
++++ libzip-0.10rc1/lib/Makefile.am	2011-03-05 20:29:30.349388003 +0100
+@@ -2,8 +2,9 @@
+ 
+ lib_LTLIBRARIES = libzip.la
+ noinst_HEADERS = zipint.h
+-include_HEADERS = zip.h
+-libinclude_HEADERS = zipconf.h
++include_HEADERS = \
++	zip.h \
++	zipconf.h
+ 
+ # also update CMakeLists.txt when changing version
+ libzip_la_LDFLAGS=-no-undefined -version-info 2:0