Hello community,
here is the log from the commit of package zlib for openSUSE:Factory checked in
at 2015-06-30 10:14:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zlib (Old)
and /work/SRC/openSUSE:Factory/.zlib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zlib"
Changes:
--------
--- /work/SRC/openSUSE:Factory/zlib/zlib.changes 2014-10-15
16:19:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes 2015-06-30
10:14:16.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 24 09:01:59 UTC 2015 - tchva...@suse.com
+
+- Remove zlib-devel-static, nothing should use libz.a anyway.
+- Package minizip library, everything using it should now pull
+ minizip-devel and unbundle it bnc#935864
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zlib.spec ++++++
--- /var/tmp/diff_new_pack.uVVO6t/_old 2015-06-30 10:14:16.000000000 +0200
+++ /var/tmp/diff_new_pack.uVVO6t/_new 2015-06-30 10:14:16.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package zlib
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,12 +32,11 @@
Patch0: zlib-1.2.7-improve-longest_match-performance.patch
#PATCH-FIX-SUSE: compiler check of varguments passed to gzprintf
Patch1: zlib-format.patch
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
BuildRequires: pkgconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# bug437293
-%ifarch ppc64
-Obsoletes: zlib-64bit
-%endif
%description
zlib is designed to be a free, general-purpose, legally unencumbered -- that
@@ -51,7 +50,7 @@
%package -n libz1
Summary: Include Files and Libraries mandatory for Development
-Group: Development/Languages/C and C++
+Group: System/Libraries
Provides: %{name} = %{version}-%{release}
Obsoletes: %{name} < %{version}-%{release}
@@ -70,28 +69,29 @@
Group: Development/Languages/C and C++
Requires: glibc-devel
Requires: libz1 = %{version}
-Provides: libz:%{_includedir}/zlib.h
-# bug437293
-%ifarch ppc64
-Obsoletes: zlib-devel-64bit
-%endif
-#
%description devel
This package contains all necessary include files and libraries needed
to develop applications that require the provided includes and
libraries.
-%package devel-static
-Summary: Include Files and Libraries mandatory for Development
+%package -n libminizip1
+Summary: Library for manipulation with .zip archives
+Group: System/Libraries
+
+%description -n libminizip1
+Minizip is a library for manipulation with files from .zip archives.
+
+%package -n minizip-devel
+Summary: Development files for the minizip library
Group: Development/Languages/C and C++
Requires: %{name}-devel = %{version}
-Provides: %{name}-devel:%{_libdir}/libz.a
+Requires: libminizip1 = %{version}
+Requires: pkgconfig
-%description devel-static
-This package contains all necessary include files and libraries needed
-to develop applications that require the provided includes and
-libraries.
+%description -n minizip-devel
+This package contains the libraries and header files needed for
+developing applications which use minizip.
%prep
%setup -q
@@ -101,31 +101,44 @@
%build
export LDFLAGS="-Wl,-z,relro,-z,now"
+export CFLAGS="%{optflags}"
+# For sure not autotools build
+CC="cc" ./configure \
+ --shared \
+ --prefix=%{_prefix} \
+ --libdir=/%{_lib}
+
# Marcus: breaks example64 in 32bit builds, so it's disabled by default
%if %{with profiling}
profiledir=$(mktemp -d)
trap "rm -rf $profiledir" EXIT
-CC="gcc" ./configure --shared --prefix=%{_prefix} --libdir=/%{_lib}
make CFLAGS="%{optflags} %{cflags_profile_generate}=$profiledir"
%{?_smp_mflags}
time make check %{?_smp_mflags}
-make clean
+make %{?_smp_mflags} clean
make CFLAGS="%{optflags} %{cflags_profile_feedback}=$profiledir"
%{?_smp_mflags}
%else
-export CFLAGS="%{optflags}"
-CC="gcc" ./configure --shared --prefix=%{_prefix} --libdir=/%{_lib}
make %{?_smp_mflags}
%endif
+# And build minizip
+cd contrib/minizip
+autoreconf -fvi
+%configure \
+ --disable-static \
+ --disable-silent-rules
+make %{?_smp_mflags}
+
%check
time make check %{?_smp_mflags}
%install
mkdir -p %{buildroot}%{_libdir}
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
-# static lib
-mv %{buildroot}/%{_lib}/libz.a %{buildroot}%{_libdir}
+# Kill static library
+rm -f %{buildroot}/%{_lib}/libz.a
# Move .pc file to _libdir
mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}%{_libdir}
# manpage
@@ -135,10 +148,19 @@
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -r examples/ %{buildroot}%{_docdir}/%{name}/
+# Install minizip
+cd contrib/minizip
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
+
%post -n libz1 -p /sbin/ldconfig
%postun -n libz1 -p /sbin/ldconfig
+%post -n libminizip1 -p /sbin/ldconfig
+
+%postun -n libminizip1 -p /sbin/ldconfig
+
%files -n libz1
%defattr(-,root,root)
/%{_lib}/libz.so.1.2.*
@@ -157,8 +179,16 @@
%{_libdir}/libz.so
%{_libdir}/pkgconfig/zlib.pc
-%files devel-static
+%files -n libminizip1
+%defattr(-,root,root)
+%doc contrib/minizip/MiniZip64_info.txt contrib/minizip/MiniZip64_Changes.txt
+%{_libdir}/libminizip.so.*
+
+%files -n minizip-devel
%defattr(-,root,root)
-%{_libdir}/libz.a
+%dir %{_includedir}/minizip
+%{_includedir}/minizip/*.h
+%{_libdir}/libminizip.so
+%{_libdir}/pkgconfig/minizip.pc
%changelog
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.uVVO6t/_old 2015-06-30 10:14:16.000000000 +0200
+++ /var/tmp/diff_new_pack.uVVO6t/_new 2015-06-30 10:14:16.000000000 +0200
@@ -3,4 +3,3 @@
provides "zlib-<targettype> = <version>"
obsoletes "zlib-<targettype> <= 1.2.8"
zlib-devel
-zlib-devel-static
