From 5ffa578f608a856684382b7c395771b7b20e4f4415a4adf8836d67bda5ae78f9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 1 Nov 2017 08:14:46 +0000 Subject: [PATCH 1/2] Accepting request 537980 from home:sbrabec:branches:Archiving - Update bzip2-1.0.6-autoconfiscated.patch: * Bump version to 1.0.6. * Fix script symlinks on platforms with EXEEXT. OBS-URL: https://build.opensuse.org/request/show/537980 OBS-URL: https://build.opensuse.org/package/show/Archiving/bzip2?expand=0&rev=64 --- bzip2-1.0.6-autoconfiscated.patch | 18 +++++++++--------- bzip2.changes | 7 +++++++ bzip2.spec | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/bzip2-1.0.6-autoconfiscated.patch b/bzip2-1.0.6-autoconfiscated.patch index ba689a3..40d3ea2 100644 --- a/bzip2-1.0.6-autoconfiscated.patch +++ b/bzip2-1.0.6-autoconfiscated.patch @@ -58,7 +58,7 @@ +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.57]) -+AC_INIT([bzip2], [1.0.5], [Julian Seward ]) ++AC_INIT([bzip2], [1.0.6], [Julian Seward ]) +BZIP2_LT_CURRENT=1 +BZIP2_LT_REVISION=6 +BZIP2_LT_AGE=0 @@ -165,10 +165,10 @@ + rm -f $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` + $(LN_S) `echo "bzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` + $(LN_S) `echo "bzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` -+ $(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` -+ $(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` -+ $(LN_S) `echo "bzmore" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` -+ $(LN_S) `echo "bzdiff" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'` ++ $(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'` ++ $(LN_S) `echo "bzmore" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform)'` ++ $(LN_S) `echo "bzdiff" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'` + +install-data-hook: + echo ".so man1/`echo "bzip2" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bunzip2" | sed 's,^.*/,,;$(transform)'`.1 @@ -181,10 +181,10 @@ +uninstall-hook: + rm -f $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` + rm -f $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` -+ rm -f $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` -+ rm -f $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` -+ rm -f $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` -+ rm -f $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'` + rm -f $(DESTDIR)$(mandir)/man1/`echo "bunzip2" | sed 's,^.*/,,;$(transform)'`.1 + rm -f $(DESTDIR)$(mandir)/man1/`echo "bzcat" | sed 's,^.*/,,;$(transform)'`.1 + rm -f $(DESTDIR)$(mandir)/man1/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'`.1 diff --git a/bzip2.changes b/bzip2.changes index ad1354b..3c55e13 100644 --- a/bzip2.changes +++ b/bzip2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 31 18:09:43 CET 2017 - sbrabec@suse.com + +- Update bzip2-1.0.6-autoconfiscated.patch: + * Bump version to 1.0.6. + * Fix script symlinks on platforms with EXEEXT. + ------------------------------------------------------------------- Tue Jun 6 10:32:06 UTC 2017 - mpluskal@suse.com diff --git a/bzip2.spec b/bzip2.spec index 17cb901..1c45d34 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/for_downstream/bzip2-1.0.6-autoconfiscated.patch +Patch0: http://ftp.suse.com/pub/people/sbrabec/bzip2/bzip2-1.0.6-autoconfiscated.patch Patch1: bzip2-1.0.6-fix-bashisms.patch Patch2: bzip2-unsafe_strcpy.patch Patch3: bzip2-point-to-doc-pkg.patch From baad931a94047d4e1f95d219561ad4ab7ad03589c232ecf065cc8fdc2e21b838 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Sat, 4 Nov 2017 12:35:34 +0000 Subject: [PATCH 2/2] Accepting request 538899 from home:bmwiedemann:branches:Archiving Fix build on Fedora and Mageia OBS-URL: https://build.opensuse.org/request/show/538899 OBS-URL: https://build.opensuse.org/package/show/Archiving/bzip2?expand=0&rev=65 --- bzip2.changes | 5 +++++ bzip2.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bzip2.changes b/bzip2.changes index 3c55e13..b0c2a06 100644 --- a/bzip2.changes +++ b/bzip2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 4 06:35:46 UTC 2017 - bwiedemann@suse.com + +- Fix build on Fedora and Mageia + ------------------------------------------------------------------- Tue Oct 31 18:09:43 CET 2017 - sbrabec@suse.com diff --git a/bzip2.spec b/bzip2.spec index 1c45d34..79eba3c 100644 --- a/bzip2.spec +++ b/bzip2.spec @@ -86,7 +86,7 @@ autoreconf -fiv %configure \ --with-pic \ --disable-static -%if %{do_profiling} +%if 0%{?do_profiling} make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" test make clean