From b667e350c941918b798c13bc54ea572813d3c11da17e6ef005a5f5c0bd8e2ec0 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 26 Feb 2018 11:24:13 +0000 Subject: [PATCH 1/2] Accepting request 580079 from home:favogt:licensetag Use %license (boo#1082318). Please forward to SLE, if possible OBS-URL: https://build.opensuse.org/request/show/580079 OBS-URL: https://build.opensuse.org/package/show/Archiving/bzip2?expand=0&rev=67 --- bzip2.changes | 5 +++++ bzip2.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bzip2.changes b/bzip2.changes index b0c2a06..a756b04 100644 --- a/bzip2.changes +++ b/bzip2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 22 15:10:29 UTC 2018 - fvogt@suse.com + +- Use %license (boo#1082318) + ------------------------------------------------------------------- Sat Nov 4 06:35:46 UTC 2017 - bwiedemann@suse.com diff --git a/bzip2.spec b/bzip2.spec index 79eba3c..0c59395 100644 --- a/bzip2.spec +++ b/bzip2.spec @@ -1,7 +1,7 @@ # # spec file for package bzip2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -150,7 +150,8 @@ make %{?_smp_mflags} test %files -n libbz2-devel %defattr(-,root,root) -%doc LICENSE CHANGES +%license LICENSE +%doc CHANGES %{_includedir}/bzlib.h %{_libdir}/libbz2.so %{_libdir}/pkgconfig/bzip2.pc From 34bcadece429404e2d0f98fc6364368ce95ae2c86c8f50db84daaec4e3a6e8b2 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 28 Feb 2018 11:48:17 +0000 Subject: [PATCH 2/2] Accepting request 580929 from home:scarabeus_iv:branches:Archiving - Update autotools patchset: D bzip2-1.0.6-autoconfiscated.patch A bzip2-1.0.6.2-autoconfiscated.patch OBS-URL: https://build.opensuse.org/request/show/580929 OBS-URL: https://build.opensuse.org/package/show/Archiving/bzip2?expand=0&rev=68 --- ...onfiscated.patch => bzip2-1.0.6.2-autoconfiscated.patch | 6 ++++-- bzip2.changes | 7 +++++++ bzip2.spec | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) rename bzip2-1.0.6-autoconfiscated.patch => bzip2-1.0.6.2-autoconfiscated.patch (99%) diff --git a/bzip2-1.0.6-autoconfiscated.patch b/bzip2-1.0.6.2-autoconfiscated.patch similarity index 99% rename from bzip2-1.0.6-autoconfiscated.patch rename to bzip2-1.0.6.2-autoconfiscated.patch index 40d3ea2..62304b8 100644 --- a/bzip2-1.0.6-autoconfiscated.patch +++ b/bzip2-1.0.6.2-autoconfiscated.patch @@ -11,7 +11,7 @@ +autoconf --- /dev/null +++ README.autotools -@@ -0,0 +1,39 @@ +@@ -0,0 +1,41 @@ +bzip2 autoconfiscated +===================== + @@ -31,7 +31,7 @@ +contact me: Stanislav Brabec + +Autoconfiscated version binaries are exactly equal to -+bzip2-1.0.5.tar.gz. There are only few changes. See below. ++bzip2-1.0.6.tar.gz. There are only few changes. See below. + + +New features: @@ -49,6 +49,8 @@ +distributions already use the new number instead of the non-standard +number from Makefile-libbz2_so. + ++Shared library exports only public symbols. ++ +To be super-safe, I incremented minor number of the library file, so +both instances of the shared library can live together. --- /dev/null diff --git a/bzip2.changes b/bzip2.changes index a756b04..f3827ea 100644 --- a/bzip2.changes +++ b/bzip2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 28 11:23:11 UTC 2018 - tchvatal@suse.com + +- Update autotools patchset: + D bzip2-1.0.6-autoconfiscated.patch + A bzip2-1.0.6.2-autoconfiscated.patch + ------------------------------------------------------------------- Thu Feb 22 15:10:29 UTC 2018 - fvogt@suse.com diff --git a/bzip2.spec b/bzip2.spec index 0c59395..61030c7 100644 --- a/bzip2.spec +++ b/bzip2.spec @@ -30,7 +30,7 @@ Source2: bznew.1.gz Source3: baselibs.conf Source100: bzip2-rpmlintrc # PATCH-FEATURE-OPENSUSE bzip2-1.0.6-autoconfiscated.patch sbrabec@suse.cz -- Convert to a standard autoconf based package. -Patch0: http://ftp.suse.com/pub/people/sbrabec/bzip2/bzip2-1.0.6-autoconfiscated.patch +Patch0: ftp://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6.2-autoconfiscated.patch Patch1: bzip2-1.0.6-fix-bashisms.patch Patch2: bzip2-unsafe_strcpy.patch Patch3: bzip2-point-to-doc-pkg.patch