- updated to 1.2.6

- removed obsolete LFS,lfs patches

Changed files:
    crossmingw32-zlib-LFS.patch -> 1.2
    crossmingw32-zlib.spec -> 1.32
    zlib-lfs.patch -> 1.2

diff --git a/crossmingw32-zlib-LFS.patch b/crossmingw32-zlib-LFS.patch
deleted file mode 100644 (file)
index 2fbbaca..0000000
--- a/crossmingw32-zlib-LFS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- zlib-1.2.4/win32/zlib.def.orig     2010-03-12 18:56:34.000000000 +0100
-+++ zlib-1.2.4/win32/zlib.def  2010-03-21 11:57:55.378704379 +0100
-@@ -72,3 +72,9 @@
-     inflateSyncPoint
-     get_crc_table
-     inflateUndermine
-+; LFS
-+    adler32_combine64
-+    crc32_combine64
-+    gzopen64
-+    gzseek64
-+    gztell64

diff --git a/crossmingw32-zlib.spec b/crossmingw32-zlib.spec
index 743736cd9552523f90dfa8b523009a05eb9dd3e4..43636196112575d41ed33aef89260f7668ca31f4 100644 (file)
--- a/crossmingw32-zlib.spec
+++ b/crossmingw32-zlib.spec
@@ -13,14 +13,12 @@
 Summary:       Library for compression and decompression - MinGW32 cross version
 Summary(pl.UTF-8):     Biblioteka z podprogramami do kompresji i dekompresji - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       1.2.5
-Release:       4
+Version:       1.2.6
+Release:       1
 License:       BSD
 Group:         Development/Libraries
 Source0:       http://www.zlib.net/current/%{realname}-%{version}.tar.gz
-# Source0-md5: c735eab2d659a96e5a594c9e8541ad63
-Patch0:                %{name}-LFS.patch
-Patch1:                %{realname}-lfs.patch
+# Source0-md5: 618e944d7c7cd6521551e30b32322f4a
 URL:           http://www.zlib.net/
 BuildRequires: crossmingw32-gcc
 BuildRequires: sed >= 4.0
@@ -89,8 +87,6 @@ zlib - biblioteka DLL dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %if %{with asmopt}
 %ifarch i686 athlon
@@ -170,8 +166,6 @@ install libz.la $RPM_BUILD_ROOT%{_libdir}
 install zlib1.dll $RPM_BUILD_ROOT%{_dlldir}
 install zlib.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/man
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 

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));