rpms/zlib/devel zlib-1.2.4-autotools.patch, 1.3, 1.4 zlib.spec, 1.56, 1.57

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/zlib/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21004

Modified Files:
	zlib-1.2.4-autotools.patch zlib.spec 
Log Message:
add header files option


zlib-1.2.4-autotools.patch:
 Makefile.am   |   32 ++++++++++++++++++++++++++++++++
 configure.ac  |   13 +++++++++++++
 minizip.pc.in |   11 +++++++++++
 3 files changed, 56 insertions(+)

Index: zlib-1.2.4-autotools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/zlib/devel/zlib-1.2.4-autotools.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- zlib-1.2.4-autotools.patch	31 Mar 2010 09:42:54 -0000	1.3
+++ zlib-1.2.4-autotools.patch	31 Mar 2010 11:11:50 -0000	1.4
@@ -18,7 +18,7 @@ diff -up zlib-1.2.4/contrib/minizip/conf
 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,32 @@
+@@ -0,0 +1,31 @@
 +ACLOCAL_AMFLAGS = -I m4 --install
 +
 +lib_LTLIBRARIES = libminizip.la
@@ -30,7 +30,7 @@ diff -up zlib-1.2.4/contrib/minizip/Make
 +	zip.c
 +
 +# do not build the static version of libminizip
-+libminizip_la_CFLAGS = -shared
++libminizip_la_CFLAGS = -shared -I ../..
 +libminizip_la_LDFLAGS = -version-info 1:0:0 -lz
 +
 +minizip_includedir = $(includedir)/minizip


Index: zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- zlib.spec	31 Mar 2010 09:42:54 -0000	1.56
+++ zlib.spec	31 Mar 2010 11:11:50 -0000	1.57
@@ -93,7 +93,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-    
 %clean
 rm -rf ${RPM_BUILD_ROOT}