From 75dd41b720e0ceb4e769af0bf81233b75ff94378075e7ac5ef1f97b480dc32a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 1 Jun 2017 14:22:52 +0000 Subject: [PATCH] Accepting request 500406 from home:pluskalm:branches:devel:libraries:c_c++ - Add gpg signature - Re-enable profiling OBS-URL: https://build.opensuse.org/request/show/500406 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=43 --- zlib-1.2.11.tar.gz.asc | 7 +++++++ zlib.changes | 6 ++++++ zlib.keyring | 38 ++++++++++++++++++++++++++++++++++++++ zlib.spec | 39 ++++++++++++++++----------------------- 4 files changed, 67 insertions(+), 23 deletions(-) create mode 100644 zlib-1.2.11.tar.gz.asc create mode 100644 zlib.keyring diff --git a/zlib-1.2.11.tar.gz.asc b/zlib-1.2.11.tar.gz.asc new file mode 100644 index 0000000..accd4d2 --- /dev/null +++ b/zlib-1.2.11.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Comment: GPGTools - http://gpgtools.org + +iD8DBQBYe7UDeD/Njli8r7oRAgRsAJ4mHDka1VqgCYija3bLjGMyD+tohACg+y+d +JCGR0qc+wctJGy2vEg5nDqk= +=8VNa +-----END PGP SIGNATURE----- diff --git a/zlib.changes b/zlib.changes index 80d63bd..cb03c6d 100644 --- a/zlib.changes +++ b/zlib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 1 13:34:38 UTC 2017 - mpluskal@suse.com + +- Add gpg signature +- Re-enable profiling + ------------------------------------------------------------------- Wed May 10 13:43:08 UTC 2017 - mpluskal@suse.com diff --git a/zlib.keyring b/zlib.keyring new file mode 100644 index 0000000..df8ac8e --- /dev/null +++ b/zlib.keyring @@ -0,0 +1,38 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +pMCmSQ== +=5shY +-----END PGP PUBLIC KEY BLOCK----- diff --git a/zlib.spec b/zlib.spec index 867aecc..3f55e3d 100644 --- a/zlib.spec +++ b/zlib.spec @@ -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 @@ License: Zlib 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: autoconf 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 @@ developing applications which use minizip. %build export LDFLAGS="-Wl,-z,relro,-z,now" - export CFLAGS="%{optflags}" # For sure not autotools build CC="cc" ./configure \ @@ -126,16 +125,13 @@ CC="cc" ./configure \ --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 @@ autoreconf -fvi 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 @@ cp -r examples/ %{buildroot}%{_docdir}/%{name}/ # 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 @@ find %{buildroot} -type f -name "*.la" -delete -print %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