Hello community, here is the log from the commit of package zlib for openSUSE:Factory checked in at 2015-06-30 12:07:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-06-30 10:14:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes 2015-06-30 12:07:47.000000000 +0200 @@ -2,7 +1,0 @@ -Wed Jun 24 09:01:59 UTC 2015 - tchvatal@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.26U1RJ/_old 2015-06-30 12:07:47.000000000 +0200 +++ /var/tmp/diff_new_pack.26U1RJ/_new 2015-06-30 12:07:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package zlib # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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,11 +32,12 @@ 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 @@ -50,7 +51,7 @@ %package -n libz1 Summary: Include Files and Libraries mandatory for Development -Group: System/Libraries +Group: Development/Languages/C and C++ Provides: %{name} = %{version}-%{release} Obsoletes: %{name} < %{version}-%{release} @@ -69,29 +70,28 @@ 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 -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 +%package devel-static +Summary: Include Files and Libraries mandatory for Development Group: Development/Languages/C and C++ Requires: %{name}-devel = %{version} -Requires: libminizip1 = %{version} -Requires: pkgconfig +Provides: %{name}-devel:%{_libdir}/libz.a -%description -n minizip-devel -This package contains the libraries and header files needed for -developing applications which use minizip. +%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 @@ -101,44 +101,31 @@ %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 %{?_smp_mflags} clean +make 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 -# 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 @@ -148,19 +135,10 @@ 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.* @@ -179,16 +157,8 @@ %{_libdir}/libz.so %{_libdir}/pkgconfig/zlib.pc -%files -n libminizip1 -%defattr(-,root,root) -%doc contrib/minizip/MiniZip64_info.txt contrib/minizip/MiniZip64_Changes.txt -%{_libdir}/libminizip.so.* - -%files -n minizip-devel +%files devel-static %defattr(-,root,root) -%dir %{_includedir}/minizip -%{_includedir}/minizip/*.h -%{_libdir}/libminizip.so -%{_libdir}/pkgconfig/minizip.pc +%{_libdir}/libz.a %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.26U1RJ/_old 2015-06-30 12:07:47.000000000 +0200 +++ /var/tmp/diff_new_pack.26U1RJ/_new 2015-06-30 12:07:47.000000000 +0200 @@ -3,3 +3,4 @@ provides "zlib-<targettype> = <version>" obsoletes "zlib-<targettype> <= 1.2.8" zlib-devel +zlib-devel-static