From 2dab7424f61eaed52eb49c4e782d5a2872a638c14e07de7003de5a0a61005186 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 24 Mar 2009 17:33:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=10 --- zlib.changes | 8 ++++++++ zlib.spec | 32 +++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/zlib.changes b/zlib.changes index 1b69331..4145517 100644 --- a/zlib.changes +++ b/zlib.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Mar 21 16:23:42 CET 2009 - crrodriguez@suse.de + +- there is one valid use case of static zlib in "qemu" package + split a -devel-static subpackage, please do not BuildRequire + this package unless you are 100% sure you need it, if in doubt + mail either the security team or me. + ------------------------------------------------------------------- Fri Feb 27 19:58:04 CET 2009 - crrodriguez@suse.de diff --git a/zlib.spec b/zlib.spec index d0f631d..a885697 100644 --- a/zlib.spec +++ b/zlib.spec @@ -30,7 +30,7 @@ Obsoletes: zlib-64bit %endif # Version: 1.2.3 -Release: 137 +Release: 138 Summary: Data Compression Library Source: zlib-%{version}.tar.bz2 Patch: zlib-1.2.1-make-test.patch @@ -74,6 +74,20 @@ libraries. +%package devel-static +License: Other uncritical OpenSource License +Summary: Include Files and Libraries mandatory for Development +Group: Development/Languages/C and C++ +Provides: %{name}-devel:%{_libdir}/libz.a +Requires: %{name}-devel = %{version} + +%description devel-static +This package contains all necessary include files and libraries needed +to develop applications that require the provided includes and +libraries. + + + %prep %setup -q %patch -p1 @@ -99,8 +113,8 @@ make install \ %{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) %{buildroot}%{_libdir}/libz.so %{__rm} -v %{buildroot}/%{_lib}/libz.so # static lib -#make libz.a -#install -m 644 libz.a $RPM_BUILD_ROOT/usr/%{_lib} +make libz.a +install -m 644 libz.a $RPM_BUILD_ROOT/%{_libdir} # manpage install -m 644 zlib.3 $RPM_BUILD_ROOT/%{_mandir}/man3 install -m 644 zutil.h $RPM_BUILD_ROOT%{_includedir} @@ -124,10 +138,18 @@ rm -rf %{buildroot} /usr/include/zlib.h /usr/include/zconf.h /usr/include/zutil.h -/usr/%{_lib}/libz.so -#/usr/%{_lib}/libz.a +%{_libdir}/libz.so + +%files devel-static +%defattr(-,root,root) +%{_libdir}/libz.a %changelog +* Sat Mar 21 2009 crrodriguez@suse.de +- there is one valid use case of static zlib in "qemu" package + split a -devel-static subpackage, please do not BuildRequire + this package unless you are 100%% sure you need it, if in doubt + mail either the security team or me. * Fri Feb 27 2009 crrodriguez@suse.de - add patch from gentoo that makes zlib to only export its public API using GCC visibility features, this will