Updated to 1.1.4

Changed files:
    zlib-sharedlib.patch -> 1.2
    zlib.spec -> 1.59

diff --git a/zlib-sharedlib.patch b/zlib-sharedlib.patch
index 13c1993bae259ce09000971877ed3ed63c3d10f5..b3e99bbd0589cbe8398f287622d7e71aba2153d5 100644 (file)
--- a/zlib-sharedlib.patch
+++ b/zlib-sharedlib.patch
@@ -1,5 +1,5 @@
---- zlib1-1.1.3.orig/configure
-+++ zlib1-1.1.3/configure
+--- zlib1-1.1.3/configure
++++ zlib1-1.1.4/configure
 @@ -69,11 +69,11 @@
  
  if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
@@ -15,8 +15,8 @@
    esac
  else
    # find system name and corresponding cc options
---- zlib1-1.1.3.orig/Makefile
-+++ zlib1-1.1.3/Makefile
+--- zlib1-1.1.3/Makefile
++++ zlib1-1.1.4/Makefile
 @@ -12,20 +12,20 @@
  # To install in $HOME instead of /usr/local, use:
  #    make install prefix=$HOME
@@ -37,9 +37,9 @@
 +LDSHARED=gcc -shared -Wl,-soname,libz.so.1 -lc
 +CPP=gcc -E
  
- VER=1.1.3
+ VER=1.1.4
 -LIBS=libz.a
-+LIBS=libz.so.1.1.3
++LIBS=libz.so.1.1.4
  SHAREDLIB=libz.so
  
  AR=ar rc
@@ -58,8 +58,8 @@
  
  OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
         zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
---- zlib1-1.1.3.orig/contrib/minizip/Makefile
-+++ zlib1-1.1.3/contrib/minizip/Makefile
+--- zlib1-1.1.3/contrib/minizip/Makefile
++++ zlib1-1.1.4444ntrib/minizip/Makefile
 @@ -1,8 +1,8 @@
  CC=cc
 -CFLAGS=-O -I../..
@@ -85,8 +85,8 @@
  
  test: miniunz minizip
        ./minizip test readme.txt
---- zlib1-1.1.3.orig/contrib/minizip/zip.c
-+++ zlib1-1.1.3/contrib/minizip/zip.c
+--- zlib1-1.1.3/contrib/minizip/zip.c
++++ zlib1-1.1.4444/contrib/minizip/zip.c
 @@ -483,7 +483,7 @@
          zi->ci.stream.opaque = (voidpf)0;
  
@@ -96,8 +96,8 @@
  
          if (err==Z_OK)
              zi->ci.stream_initialised = 1;
---- zlib1-1.1.3.orig/ztest12023.c
-+++ zlib1-1.1.3/ztest12023.c
+--- zlib1-1.1.3/ztest12023.c
++++ zlib1-1.1.4/ztest12023.c
 @@ -0,0 +1,2 @@
 +extern int getchar();
 +int hello() {return getchar();}

diff --git a/zlib.spec b/zlib.spec
index 20fba07917fb881a97f23576842f3da1394c9c73..e5802868496dde0a673c84fac0dab17dca1b7d01 100644 (file)
--- a/zlib.spec
+++ b/zlib.spec
@@ -17,14 +17,13 @@ Summary(pl):        Biblioteka z podprogramami do kompresji i dekompresji
 Summary(pt_BR):        Biblioteca para compressão e descompressão
 Summary(tr):   Sýkýþtýrma iþlemleri için kitaplýk
 Name:          zlib
-Version:       1.1.3
-Release:       30
+Version:       1.1.4
+Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       http://www.gzip.org/%{name}/%{name}-%{version}.tar.gz
 Patch0:                %{name}-sharedlib.patch
 Patch1:                %{name}-asmopt.patch
-Patch2:                %{name}-sec.patch
 URL:           http://www.zlib.org/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     zlib1
@@ -201,7 +200,6 @@ Bibliotecas est
 %setup -q
 %patch0 -p1
 %{?_with_asmopt:%patch1 -p1}
-%patch2 -p1
 
 %if %{_asmopt}
 %patch1 -p1