From ea1725f73cc3aa49b70b9ca2cab8775f319622b0 Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Fri, 23 Nov 2007 10:33:03 +0000
Subject: [PATCH] - remove minizip headers to minizip-devel - spec file cleanup
 - fix minizip.pc file

---
 zlib-1.2.3-minizip.patch | 12 ++++++++++++
 zlib.spec                | 19 +++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 zlib-1.2.3-minizip.patch

diff --git a/zlib-1.2.3-minizip.patch b/zlib-1.2.3-minizip.patch
new file mode 100644
index 0000000..6a5072f
--- /dev/null
+++ b/zlib-1.2.3-minizip.patch
@@ -0,0 +1,12 @@
+diff -up zlib-1.2.3/contrib/minizip/minizip.pc.in.pom zlib-1.2.3/contrib/minizip/minizip.pc.in
+--- zlib-1.2.3/contrib/minizip/minizip.pc.in.pom	2007-11-23 11:00:38.000000000 +0100
++++ zlib-1.2.3/contrib/minizip/minizip.pc.in	2007-11-23 11:01:37.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@includedir@/minizip
+ 
+ Name: @PACKAGE_NAME@
+ Description: Minizip zip file manipulation library
diff --git a/zlib.spec b/zlib.spec
index 6d2d7b6..b18eef6 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,11 +1,12 @@
 Summary: The zlib compression and decompression library
 Name: zlib
 Version: 1.2.3
-Release: 15%{?dist}
+Release: 16%{?dist}
 Group: System Environment/Libraries
 Source: http://www.zlib.net/zlib-%{version}.tar.gz
 Patch3: zlib-1.2.3-autotools.patch
 Patch4: minizip-1.2.3-autotools.patch
+Patch5: zlib-1.2.3-minizip.patch
 URL: http://www.gzip.org/zlib/
 License: BSD
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,13 +42,14 @@ Group: System Environment/Libraries
 Requires: zlib = %{version}-%{release}
 
 %description -n  minizip
-Minizip manipulates files from a .zip archive
+Minizip manipulates files from a .zip archive.
 
 %package -n minizip-devel
 Summary: Development files for the minizip library
 Group: Development/Libraries
 Requires: minizip = %{version}-%{release}
 Requires: zlib-devel = %{version}-%{release}
+Requires: pkgconfig
 
 %description -n minizip-devel
 This package contains the libraries and header files needed for
@@ -57,6 +59,7 @@ developing applications which use minizip.
 %setup -q
 %patch3 -p1 -b .autotools
 %patch4 -p1 -b .autotools2
+%patch5 -p1 -b .inc
 
 %build
 autoreconf --install;
@@ -95,7 +98,7 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libz.la
 # install minizip subpackage
 cd contrib/minizip
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 rm -f $RPM_BUILD_ROOT/%{_bindir}/miniunzip
 rm -f $RPM_BUILD_ROOT/%{_bindir}/minizip
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libminizip.la
@@ -121,7 +124,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root,-)
 %doc README algorithm.txt minigzip.c example.c
 %{_libdir}/libz.so
-%{_includedir}/*
+%{_includedir}/zconf.h
+%{_includedir}/zlib.h
 %{_mandir}/man3/zlib.3*
 
 %files static
@@ -136,10 +140,17 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -n minizip-devel
 %defattr(-,root,root,-)
+%dir %{_includedir}/minizip
+%{_includedir}/minizip/*.h
 %{_libdir}/libminizip.so
 %{_libdir}/pkgconfig/minizip.pc
 
 %changelog
+* Fri Nov 23 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-16
+- remove minizip headers to minizip-devel
+- spec file cleanup
+- fix minizip.pc file
+
 * Wed Nov 14 2007 Ivana Varekova <varekova@redhat.com> - 1.2.3-15
 - separate static subpackage