diff --git a/zlib-1.2.4-autotools.patch b/zlib-1.2.4-autotools.patch index 91e9b0c..73de59e 100644 --- a/zlib-1.2.4-autotools.patch +++ b/zlib-1.2.4-autotools.patch @@ -18,7 +18,7 @@ diff -up zlib-1.2.4/contrib/minizip/configure.ac.atools zlib-1.2.4/contrib/miniz diff -up zlib-1.2.4/contrib/minizip/Makefile.am.atools zlib-1.2.4/contrib/minizip/Makefile.am --- zlib-1.2.4/contrib/minizip/Makefile.am.atools 2010-03-29 10:28:50.000000000 +0200 +++ zlib-1.2.4/contrib/minizip/Makefile.am 2010-03-29 10:32:11.000000000 +0200 -@@ -0,0 +1,33 @@ +@@ -0,0 +1,32 @@ +ACLOCAL_AMFLAGS = -I m4 --install + +lib_LTLIBRARIES = libminizip.la @@ -31,8 +31,7 @@ diff -up zlib-1.2.4/contrib/minizip/Makefile.am.atools zlib-1.2.4/contrib/minizi + +# do not build the static version of libminizip +libminizip_la_CFLAGS = -shared -+libminizip_la_LDFLAGS = -version-info 1:0:0 -+LDADD=-lz ++libminizip_la_LDFLAGS = -version-info 1:0:0 -lz + +minizip_includedir = $(includedir)/minizip +minizip_include_HEADERS = \ diff --git a/zlib.spec b/zlib.spec index dd676a6..496fce5 100644 --- a/zlib.spec +++ b/zlib.spec @@ -64,8 +64,8 @@ iconv -f windows-1252 -t utf-8 ChangeLog.tmp mv ChangeLog.tmp ChangeLog %build -./configure --libdir=%{_libdir} --includedir=%{_includedir} --prefix=%{_prefix} -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE64_SOURCE=1" +CFLAGS=$RPM_OPT_FLAGS ./configure --libdir=%{_libdir} --includedir=%{_includedir} --prefix=%{_prefix} +make %{?_smp_mflags} cd contrib/minizip autoreconf --install