- updated to 1.2.6 (note: new minizip soname)

- removed obsolete lfs,minizip-autotools patches
- build static libminizip

Changed files:
    minizip-autotools.patch -> 1.3
    zlib-lfs.patch -> 1.3
    zlib.spec -> 1.143

diff --git a/minizip-autotools.patch b/minizip-autotools.patch
deleted file mode 100644 (file)
index 7105f67..0000000
--- a/minizip-autotools.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/autogen.sh zlib-1.2.3.patched/contrib/minizip/autogen.sh
---- zlib-1.2.3.orig/contrib/minizip/autogen.sh 1969-12-31 17:00:00.000000000 -0700
-+++ zlib-1.2.3.patched/contrib/minizip/autogen.sh      2007-06-30 23:31:01.000000000 -0600
-@@ -0,0 +1,53 @@
-+#! /bin/sh
-+set -e
-+
-+# $Id$
-+#
-+# Copyright (c) 2002  Daniel Elstner  <daniel.elstner@gmx.net>
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License VERSION 2 as
-+# published by the Free Software Foundation.  You are not allowed to
-+# use any other version of the license; unless you got the explicit
-+# permission from the author to do so.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+
-+
-+dir=`echo "$0" | sed 's,[^/]*$,,'`
-+test "x${dir}" = "x" && dir='.'
-+
-+if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
-+then
-+    echo "This script must be executed directly from the source directory."
-+    exit 1
-+fi
-+
-+LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
-+AUTOCONF=${AUTOCONF:-autoconf}
-+AUTOMAKE=${AUTOMAKE:-automake}
-+AUTOHEADER=${AUTOHEADER:-autoheader}
-+
-+ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
-+
-+rm -f config.cache acconfig.h
-+
-+do_cmd() {
-+    echo "- $@"
-+    $@
-+}
-+
-+do_cmd $ACLOCAL
-+do_cmd $LIBTOOLIZE -c --force
-+do_cmd $AUTOHEADER
-+do_cmd $AUTOCONF
-+do_cmd $AUTOMAKE -c --add-missing --foreign
-+#do_cmd ./configure "$@"
-diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/configure.ac zlib-1.2.3.patched/contrib/minizip/configure.ac
---- zlib-1.2.3.orig/contrib/minizip/configure.ac       1969-12-31 17:00:00.000000000 -0700
-+++ zlib-1.2.3.patched/contrib/minizip/configure.ac    2007-06-28 14:57:39.000000000 -0600
-@@ -0,0 +1,21 @@
-+AC_INIT([minizip], 1.2.3, [info@winimage.com])
-+
-+AC_PROG_LIBTOOL
-+
-+#
-+# +1 :  ? : +1 == new interface that does not break old one
-+# +1 :  ? :  0 == new interface that breaks old one
-+#  ? :  ? :  0 == no new interfaces, but breaks apps
-+#  ? : +1 :  ? == just some internal changes, nothing breaks but might work better
-+# CURRENT : REVISION : AGE
-+LIBTOOL_SO_VERSION=0:0:0
-+AC_SUBST(LIBTOOL_SO_VERSION)
-+
-+AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2 dist-zip])
-+AM_CONFIG_HEADER([config.h])
-+
-+AC_LANG_C
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+
-+AC_OUTPUT(Makefile minizip.pc)
-diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/Makefile.am zlib-1.2.3.patched/contrib/minizip/Makefile.am
---- zlib-1.2.3.orig/contrib/minizip/Makefile.am        1969-12-31 17:00:00.000000000 -0700
-+++ zlib-1.2.3.patched/contrib/minizip/Makefile.am     2007-06-28 15:01:34.000000000 -0600
-@@ -0,0 +1,41 @@
-+METASOURCES = AUTO
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = minizip.pc
-+
-+lib_LTLIBRARIES = libminizip.la
-+library_includedir = $(prefix)/include/minizip
-+
-+libminizip_la_SOURCES = \
-+      ioapi.c \
-+      mztools.c \
-+      unzip.c \
-+      zip.c
-+
-+library_include_HEADERS = \
-+      crypt.h \
-+      ioapi.h \
-+      mztools.h \
-+      unzip.h \
-+      zip.h
-+
-+EXTRA_DIST = \
-+      crypt.h \
-+      ioapi.h \
-+      mztools.h \
-+      unzip.h \
-+      zip.h
-+
-+bin_PROGRAMS = miniunzip minizip
-+
-+miniunzip_SOURCES = miniunz.c
-+miniunzip_LDADD = -lminizip
-+miniunzip_CPPFLAGS = -I../../
-+
-+minizip_SOURCES = minizip.c
-+minizip_LDADD = -lminizip
-+minizip_CPPFLAGS = -I../../
-+
-+libminizip_la_CPPFLAGS = -I../../
-+libminizip_la_LIBADD = -lz
-+libminizip_la_LDFLAGS = -L../../
-diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/minizip.pc.in zlib-1.2.3.patched/contrib/minizip/minizip.pc.in
---- zlib-1.2.3.orig/contrib/minizip/minizip.pc.in      1969-12-31 17:00:00.000000000 -0700
-+++ zlib-1.2.3.patched/contrib/minizip/minizip.pc.in   2007-06-28 14:55:38.000000000 -0600
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: Minizip zip file manipulation library
-+Requires:
-+Version: @PACKAGE_VERSION@
-+Libs: -L${libdir} -lminizip -lz
-+Cflags: -I${includedir}
-diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/minizip.spec zlib-1.2.3.patched/contrib/minizip/minizip.spec
---- zlib-1.2.3.orig/contrib/minizip/minizip.spec       1969-12-31 17:00:00.000000000 -0700
-+++ zlib-1.2.3.patched/contrib/minizip/minizip.spec    2007-07-01 00:00:41.000000000 -0600
-@@ -0,0 +1,76 @@
-+Summary:      Minizip manipulates files from a .zip archive
-+Name:         minizip
-+Version:      1.2.3
-+Release:      1
-+License:      BSD
-+Group:                System Environment/Libraries
-+URL:          http://www.winimage.com/zLibDll/minizip.html
-+Source0:      http://www.zlib.net/zlib-%{version}.tar.gz
-+Patch0:         minizip-%{version}-autotools.patch
-+Buildroot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-+BuildRequires:        automake, autoconf, libtool
-+BuildRequires:        zlib-devel >= %{version}
-+
-+%description
-+Minizip manipulates files from a .zip archive
-+
-+
-+%package        devel
-+Summary:      Development files for the minizip library
-+Group:          Development/Libraries
-+Requires:       %{name} = %{version}-%{release}
-+BuildRequires:        zlib-devel >= %{version}
-+
-+%description    devel
-+This package contains the libraries and header files needed for
-+developing applications which use minizip.
-+
-+
-+%prep
-+%setup -q -n zlib-%{version}
-+%patch0 -p1
-+
-+%build
-+cd contrib/minizip
-+sh autogen.sh
-+%configure --enable-static=no
-+# SMP flags are explicitly omitted due to a libtool/autoconf
-+# dependency race condition
-+%{__make}
-+
-+
-+%install
-+cd contrib/minizip
-+%{__rm} -rf %{buildroot}
-+
-+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
-+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-+
-+
-+%clean
-+%{__rm} -rf %{buildroot}
-+
-+
-+%post -p /sbin/ldconfig
-+
-+
-+%postun -p /sbin/ldconfig
-+
-+
-+%files
-+%defattr(-,root,root,-)
-+%doc contrib/minizip/ChangeLogUnzip
-+%{_bindir}/minizip
-+%{_bindir}/miniunzip
-+%{_libdir}/libminizip.so.*
-+
-+%files devel
-+%defattr(-,root,root,-)
-+%{_includedir}/minizip
-+%{_libdir}/libminizip.so
-+%{_libdir}/pkgconfig/minizip.pc
-+
-+%changelog
-+* Sat Jun 30 2007 Rick L Vinyard Jr <rvinyard@cs.nmsu.edu> - 1.2.3-1
-+- Initial version
-+

diff --git a/zlib-lfs.patch b/zlib-lfs.patch
deleted file mode 100644 (file)
index 51f0a67..0000000
--- a/zlib-lfs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Improper condition was introduced in 1.2.5 causing some applications
-(e.g. cgit) to fail due to conflicting declarations.
-
-References:
-- http://mail.madler.net/pipermail/zlib-devel_madler.net/2010-May/002249.html
-- http://bugs.debian.org/439980
-- http://bugs.gentoo.org/show_bug.cgi?id=316377
-- http://bugs.gentoo.org/show_bug.cgi?id=316855
-- http://bugs.archlinux.org/task/19280
-- https://bugs.launchpad.net/ubuntu/+source/libpciaccess/+bug/402178
-
---- zlib-1.2.5/zlib.h.orig     2010-04-20 06:12:48.000000000 +0200
-+++ zlib-1.2.5/zlib.h  2010-05-24 21:28:52.465538337 +0200
-@@ -1562,7 +1562,7 @@
-  * functions are changed to 64 bits) -- in case these are set on systems
-  * without large file support, _LFS64_LARGEFILE must also be true
-  */
--#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-+#if (defined(_LARGEFILE64_SOURCE) || (_FILE_OFFSET_BITS-0 == 64)) && _LFS64_LARGEFILE-0
-    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-@@ -1578,14 +1578,6 @@
- #  define gzoffset gzoffset64
- #  define adler32_combine adler32_combine64
- #  define crc32_combine crc32_combine64
--#  ifdef _LARGEFILE64_SOURCE
--     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
--     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
--     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
--     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
--     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
--     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
--#  endif
- #else
-    ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-    ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));

diff --git a/zlib.spec b/zlib.spec
index 620dfa68b274d36b7388b0e85f9fa8b5ea6b7386..5cca88065a5d1a9b0e6798e679cb44fbfb616baa 100644 (file)
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_without asmopt  # without assembler optimization for i686+
-%bcond_without tests
+%bcond_without tests   # do not perform "make check"
 #
 %ifnarch i686 pentium3 pentium4 athlon %{x8664}
 %undefine      with_asmopt
@@ -16,19 +16,17 @@ Summary(ru.UTF-8):  Библиотека для компрессии и деко
 Summary(tr.UTF-8):     Sıkıştırma işlemleri için kitaplık
 Summary(uk.UTF-8):     Бібліотека для компресії та декомпресії
 Name:          zlib
-Version:       1.2.5
-Release:       5
+Version:       1.2.6
+Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       http://www.zlib.net/current/%{name}-%{version}.tar.gz
-# Source0-md5: c735eab2d659a96e5a594c9e8541ad63
-Patch0:                minizip-autotools.patch
-Patch1:                %{name}-asm.patch
-Patch2:                %{name}-lfs.patch
+# Source0-md5: 618e944d7c7cd6521551e30b32322f4a
+Patch0:                %{name}-asm.patch
 URL:           http://www.zlib.net/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.0
 BuildRequires: rpm >= 4.4.9-56
 Obsoletes:     zlib1
 Conflicts:     elinks < 1:0.12
@@ -277,11 +275,21 @@ applications which use minizip.
 Ten pakiet zawiera pliki nagłówkowe potrzebne do tworzenia aplikacji
 wykorzystujących bibliotekę minizip.
 
+%package -n minizip-static
+Summary:       Static minizip library
+Summary(pl.UTF-8):     Statyczna biblioteka minizip
+Group:         Development/Libraries
+Requires:      minizip-devel = %{epoch}:%{version}-%{release}
+
+%description -n minizip-static
+This package contains the static version of minizip library.
+
+%description -n minizip-static -l pl.UTF-8
+Ten pakiet zawiera statyczną wersję biblioteki minizip.
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %if %{with asmopt}
 %ifarch i686 pentium3 pentium4 athlon
@@ -304,13 +312,12 @@ CFLAGS="-D_REENTRANT %{rpmcppflags} %{rpmcflags} %{?with_asmopt:-DASMV}" \
        %{?with_asmopt:OBJA=match.o PIC_OBJA=match.lo}
 
 cd contrib/minizip
-%{__aclocal}
 %{__libtoolize}
-%{__autoheader}
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure \
-       --disable-static
+       --enable-demos
 # SMP flags are explicitly omitted due to a libtool/autoconf
 # dependency race condition
 %{__make} -j1
@@ -367,7 +374,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/miniunzip
 %attr(755,root,root) %{_bindir}/minizip
 %attr(755,root,root) %{_libdir}/libminizip.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libminizip.so.0
+%attr(755,root,root) %ghost %{_libdir}/libminizip.so.1
 
 %files -n minizip-devel
 %defattr(644,root,root,755)
@@ -375,3 +382,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libminizip.la
 %{_includedir}/minizip
 %{_pkgconfigdir}/minizip.pc
+
+%files -n minizip-static
+%defattr(644,root,root,755)
+%{_libdir}/libminizip.a