From df80c71819115bac4a78601d88c84b9dd6af7b77b0983746c5f9084cf1eb2f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 30 Jun 2015 11:31:09 +0000 Subject: [PATCH 1/2] - Bring back zlib-devel-static. Needed by binutils OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=29 --- baselibs.conf | 1 + zlib.changes | 5 +++++ zlib.spec | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 5d621c6..b56052f 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -3,3 +3,4 @@ libz1 provides "zlib- = " obsoletes "zlib- <= 1.2.8" zlib-devel +zlib-devel-static diff --git a/zlib.changes b/zlib.changes index 3a64a26..6719034 100644 --- a/zlib.changes +++ b/zlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 30 11:30:37 UTC 2015 - tchvatal@suse.com + +- Bring back zlib-devel-static. Needed by binutils + ------------------------------------------------------------------- Wed Jun 24 09:01:59 UTC 2015 - tchvatal@suse.com diff --git a/zlib.spec b/zlib.spec index 3d52e90..6d93782 100644 --- a/zlib.spec +++ b/zlib.spec @@ -75,6 +75,14 @@ This package contains all necessary include files and libraries needed to develop applications that require the provided includes and libraries. +%package devel-static +Summary: Static lib for libz1 library +Group: Development/Languages/C and C++ +Provides: %{name}-devel:%{_libdir}/libz.a + +%description devel-static +Static library for libz1 package, that is complementing the devel package + %package -n libminizip1 Summary: Library for manipulation with .zip archives Group: System/Libraries @@ -137,8 +145,8 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} # Fix shared library placement/symlinks ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) %{buildroot}%{_libdir}/libz.so rm -v %{buildroot}/%{_lib}/libz.so -# Kill static library -rm -f %{buildroot}/%{_lib}/libz.a +# Static lib +mv %{buildroot}/%{_lib}/libz.a %{buildroot}%{_libdir} # Move .pc file to _libdir mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}%{_libdir} # manpage @@ -191,4 +199,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/libminizip.so %{_libdir}/pkgconfig/minizip.pc +%files devel-static +%defattr(-,root,root) +%{_libdir}/libz.a + %changelog From b842c514a4880f52e12850f5822bbfbcc83452e9ac4892cccc66c5c4db2842f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 13 Jul 2015 11:59:05 +0000 Subject: [PATCH 2/2] - Require zlib-devel in zlib-devel-static to fix previous change OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=30 --- zlib.changes | 5 +++++ zlib.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/zlib.changes b/zlib.changes index 6719034..751d607 100644 --- a/zlib.changes +++ b/zlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 13 11:58:44 UTC 2015 - tchvatal@suse.com + +- Require zlib-devel in zlib-devel-static to fix previous change + ------------------------------------------------------------------- Tue Jun 30 11:30:37 UTC 2015 - tchvatal@suse.com diff --git a/zlib.spec b/zlib.spec index 6d93782..f92409e 100644 --- a/zlib.spec +++ b/zlib.spec @@ -78,6 +78,7 @@ libraries. %package devel-static Summary: Static lib for libz1 library Group: Development/Languages/C and C++ +Requires: %{name}-devel = %{version} Provides: %{name}-devel:%{_libdir}/libz.a %description devel-static