Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2017-06-05 18:48:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and      /work/SRC/openSUSE:Factory/.zlib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "zlib"

Mon Jun  5 18:48:32 2017 rev:65 rq:500414 version:1.2.11

Changes:
--------
--- /work/SRC/openSUSE:Factory/zlib/zlib.changes        2017-05-24 
16:45:29.699719361 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2017-06-05 
18:48:34.128215127 +0200
@@ -1,0 +2,6 @@
+Thu Jun  1 13:34:38 UTC 2017 - mplus...@suse.com
+
+- Add gpg signature
+- Re-enable profiling
+
+-------------------------------------------------------------------

New:
----
  zlib-1.2.11.tar.gz.asc
  zlib.keyring

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zlib.spec ++++++
--- /var/tmp/diff_new_pack.KWIRZl/_old  2017-06-05 18:48:34.904105766 +0200
+++ /var/tmp/diff_new_pack.KWIRZl/_new  2017-06-05 18:48:34.908105202 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package zlib
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,7 +16,6 @@
 #
 
 
-%bcond_with profiling
 Name:           zlib
 Version:        1.2.11
 Release:        0
@@ -25,9 +24,11 @@
 Group:          Development/Libraries/C and C++
 Url:            http://www.zlib.net/
 Source0:        http://zlib.net/zlib-%{version}.tar.gz
-Source1:        LICENSE
-Source2:        baselibs.conf
-Source3:        zlib-rpmlintrc
+Source1:        http://zlib.net/zlib-%{version}.tar.gz.asc
+Source2:        %{name}.keyring
+Source4:        LICENSE
+Source5:        baselibs.conf
+Source6:        zlib-rpmlintrc
 #PATCH-FIX-SUSE: fate#314093, sent upstream by IBM
 Patch0:         zlib-1.2.11-optimized-s390.patch
 #PATCH-FIX-SUSE: compiler check of varguments passed to gzprintf
@@ -36,7 +37,6 @@
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 zlib is a general-purpose lossless data-compression library,
@@ -118,7 +118,6 @@
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now"
-
 export CFLAGS="%{optflags}"
 # For sure not autotools build
 CC="cc" ./configure \
@@ -126,16 +125,13 @@
     --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
-make CFLAGS="%{optflags} %{cflags_profile_generate}=$profiledir" 
%{?_smp_mflags}
-time make check %{?_smp_mflags}
-make %{?_smp_mflags} clean
-make CFLAGS="%{optflags} %{cflags_profile_feedback}=$profiledir" 
%{?_smp_mflags}
+%if %{do_profiling}
+  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}"
+  make check %{?_smp_mflags}
+  make clean
+  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}"
 %else
-make %{?_smp_mflags}
+  make %{?_smp_mflags}
 %endif
 
 # And build minizip
@@ -147,11 +143,11 @@
 make %{?_smp_mflags}
 
 %check
-time make check %{?_smp_mflags}
+make check %{?_smp_mflags}
 
 %install
 mkdir -p %{buildroot}%{_libdir}
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 # Fix shared library placement/symlinks
 ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) 
%{buildroot}%{_libdir}/libz.so
 rm -v %{buildroot}/%{_lib}/libz.so
@@ -168,15 +164,12 @@
 
 # Install minizip
 cd contrib/minizip
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 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
@@ -190,7 +183,7 @@
 %dir %{_docdir}/%{name}/
 %dir %{_docdir}/%{name}/examples
 %{_docdir}/%{name}/examples/*
-%{_mandir}/man3/zlib.3.gz
+%{_mandir}/man3/zlib.3%{ext_man}
 %{_includedir}/zlib.h
 %{_includedir}/zconf.h
 %{_includedir}/zutil.h


Reply via email to