rpms/zlib/devel zlib-1.2.3-minizip.patch, NONE, 1.1 zlib.spec, 1.42, 1.43
Ivana Varekova (varekova)
fedora-extras-commits at redhat.com
Fri Nov 23 10:33:35 UTC 2007
- Previous message (by thread): rpms/ghostscript/devel .cvsignore, 1.24, 1.25 ghostscript-8.57-ijs-krgb.patch, 1.1, 1.2 ghostscript-multilib.patch, 1.2, 1.3 ghostscript.spec, 1.145, 1.146 sources, 1.28, 1.29 ghostscript-CVE-2007-2721.patch, 1.1, NONE ghostscript-mkstemp64.patch, 1.2, NONE
- Next message (by thread): rpms/xsane/devel xsane-0.995-xdg-open.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 xsane.spec, 1.53, 1.54 xsane-0.90-htmlview.patch, 1.2, NONE xsane-0.92_gimp2.0.patch, 1.2, NONE xsane-0.99-medium-definitions.patch, 1.1, NONE xsane-0.994-showeulaonce.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: varekova
Update of /cvs/pkgs/rpms/zlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14290
Modified Files:
zlib.spec
Added Files:
zlib-1.2.3-minizip.patch
Log Message:
- remove minizip headers to minizip-devel
- spec file cleanup
- fix minizip.pc file
zlib-1.2.3-minizip.patch:
--- NEW FILE zlib-1.2.3-minizip.patch ---
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
Index: zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- zlib.spec 14 Nov 2007 15:30:48 -0000 1.42
+++ zlib.spec 23 Nov 2007 10:33:03 -0000 1.43
@@ -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 @@
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 @@
%setup -q
%patch3 -p1 -b .autotools
%patch4 -p1 -b .autotools2
+%patch5 -p1 -b .inc
%build
autoreconf --install;
@@ -95,7 +98,7 @@
# 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 @@
%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 @@
%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 at 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 at redhat.com> - 1.2.3-15
- separate static subpackage
- Previous message (by thread): rpms/ghostscript/devel .cvsignore, 1.24, 1.25 ghostscript-8.57-ijs-krgb.patch, 1.1, 1.2 ghostscript-multilib.patch, 1.2, 1.3 ghostscript.spec, 1.145, 1.146 sources, 1.28, 1.29 ghostscript-CVE-2007-2721.patch, 1.1, NONE ghostscript-mkstemp64.patch, 1.2, NONE
- Next message (by thread): rpms/xsane/devel xsane-0.995-xdg-open.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 xsane.spec, 1.53, 1.54 xsane-0.90-htmlview.patch, 1.2, NONE xsane-0.92_gimp2.0.patch, 1.2, NONE xsane-0.99-medium-definitions.patch, 1.1, NONE xsane-0.994-showeulaonce.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list