- updated to 0.11.2

- removed fix_headers patch (zipconf.h is potentially arch-dependent and kept
in arch-dependent dir for multilib configurations); use pkg-config to get complete CFLAGS
- removed outdated php-changes patch (similar changes already upstream)

diff --git a/libzip-0.10-php-changes.patch b/libzip-0.10-php-changes.patch
deleted file mode 100644 (file)
index e3dea35..0000000
--- a/libzip-0.10-php-changes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -up libzip-0.10/lib/zip_close.c.php libzip-0.10/lib/zip_close.c
---- libzip-0.10/lib/zip_close.c.php    2011-02-20 09:01:03.000000000 -0500
-+++ libzip-0.10/lib/zip_close.c        2012-01-25 18:37:04.188136374 -0500
-@@ -602,13 +602,15 @@ _zip_create_temp_output(struct zip *za,
-     char *temp;
-     int tfd;
-     FILE *tfp;
-+
-+    int len = strlen(za->zn) + 8;
-     
--    if ((temp=(char *)malloc(strlen(za->zn)+8)) == NULL) {
-+    if ((temp=(char *)malloc(len)) == NULL) {
-       _zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
-       return NULL;
-     }
- 
--    sprintf(temp, "%s.XXXXXX", za->zn);
-+    snprintf(temp, len, "%s.XXXXXX", za->zn);
- 
-     if ((tfd=mkstemp(temp)) == -1) {
-       _zip_error_set(&za->error, ZIP_ER_TMPOPEN, errno);
-diff -up libzip-0.10/lib/zip_fclose.c.php libzip-0.10/lib/zip_fclose.c
---- libzip-0.10/lib/zip_fclose.c.php   2010-03-08 07:27:48.000000000 -0500
-+++ libzip-0.10/lib/zip_fclose.c       2012-01-25 18:36:22.389542215 -0500
-@@ -47,12 +47,14 @@ zip_fclose(struct zip_file *zf)
-     if (zf->src)
-       zip_source_free(zf->src);
- 
--    for (i=0; i<zf->za->nfile; i++) {
--      if (zf->za->file[i] == zf) {
--          zf->za->file[i] = zf->za->file[zf->za->nfile-1];
--          zf->za->nfile--;
--          break;
--      }
-+    if (zf->za) {
-+        for (i=0; i<zf->za->nfile; i++) {
-+          if (zf->za->file[i] == zf) {
-+              zf->za->file[i] = zf->za->file[zf->za->nfile-1];
-+              zf->za->nfile--;
-+              break;
-+          }
-+        }
-     }
- 
-     ret = 0;
-diff -up libzip-0.10/lib/zip.h.php libzip-0.10/lib/zip.h
---- libzip-0.10/lib/zip.h.php  2011-03-04 12:17:43.000000000 -0500
-+++ libzip-0.10/lib/zip.h      2012-01-25 18:36:22.389542215 -0500
-@@ -59,7 +59,7 @@ extern "C" {
- #define ZIP_CREATE           1
- #define ZIP_EXCL             2
- #define ZIP_CHECKCONS        4
--
-+#define ZIP_OVERWRITE        8
- 
- /* flags for zip_name_locate, zip_fopen, zip_stat, ... */
- 
-diff -up libzip-0.10/lib/zip_open.c.php libzip-0.10/lib/zip_open.c
---- libzip-0.10/lib/zip_open.c.php     2011-03-16 07:18:44.000000000 -0400
-+++ libzip-0.10/lib/zip_open.c 2012-01-25 18:36:22.389542215 -0500
-@@ -61,10 +61,16 @@ ZIP_EXTERN struct zip *
- zip_open(const char *fn, int flags, int *zep)
- {
-     FILE *fp;
-+
-+    if (flags & ZIP_OVERWRITE) {
-+      return _zip_allocate_new(fn, zep);
-+    }
-     
-     switch (_zip_file_exists(fn, flags, zep)) {
-     case -1:
--      return NULL;
-+        if (!(flags & ZIP_OVERWRITE)) {
-+            return NULL;
-+        }
-     case 0:
-       return _zip_allocate_new(fn, zep);
-     default:
-@@ -482,7 +488,7 @@ _zip_file_exists(const char *fn, int fla
-     }
-     
-     if (stat(fn, &st) != 0) {
--      if (flags & ZIP_CREATE)
-+      if (flags & ZIP_CREATE || flags & ZIP_OVERWRITE)
-           return 0;
-       else {
-           set_error(zep, NULL, ZIP_ER_OPEN);

diff --git a/libzip-fix_headers.patch b/libzip-fix_headers.patch
deleted file mode 100644 (file)
index 7591710..0000000
--- a/libzip-fix_headers.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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

diff --git a/libzip.spec b/libzip.spec
index 131c931bdeb999fe7d429f1f7d60134c4c4c5783..f6eff52bb3bb18b2bdd67c646fb7ff56f9610eb8 100644 (file)
--- a/libzip.spec
+++ b/libzip.spec
@@ -1,15 +1,12 @@
 Summary:       C library for reading, creating, and modifying zip archives
 Summary(pl.UTF-8):     Biblioteka C do odczytu, zapisu i modyfikacji archiwów zip
 Name:          libzip
-Version:       0.11.1
+Version:       0.11.2
 Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       http://www.nih.at/libzip/%{name}-%{version}.tar.xz
-# Source0-md5: 87d5ec3629f6ad2a4b01ad961e7f0c19
-Patch0:                %{name}-fix_headers.patch
-# https://bugs.php.net/bug.php?id=39388
-Patch1:                %{name}-0.10-php-changes.patch
+# Source0-md5: 44c99b67dca34707b5728e5f8434fe91
 URL:           http://www.nih.at/libzip/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
@@ -58,7 +55,6 @@ Statyczna biblioteka libzip.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -97,8 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libzip.so
+%dir %{_libdir}/libzip
+%{_libdir}/libzip/include
 %{_includedir}/zip.h
-%{_includedir}/zipconf.h
 %{_pkgconfigdir}/libzip.pc
 %{_mandir}/man3/libzip.3*
 %{_mandir}/man3/zip_*.3*