From 51014c78f6c52760bb60d4254222ec28c564fc98fc3ef083a3a7528e229d6657 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Wed, 3 Nov 2010 11:56:55 +0000 Subject: [PATCH] update autoconfiscate patch OBS-URL: https://build.opensuse.org/package/show/Archiving/bzip2?expand=0&rev=15 --- ...ated.patch => bzip2-1.0.6-autoconfiscated.patch | 14 +++++++------- bzip2.changes | 5 +++++ bzip2.spec | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) rename bzip2-1.0.5-autoconfiscated.patch => bzip2-1.0.6-autoconfiscated.patch (95%) diff --git a/bzip2-1.0.5-autoconfiscated.patch b/bzip2-1.0.6-autoconfiscated.patch similarity index 95% rename from bzip2-1.0.5-autoconfiscated.patch rename to bzip2-1.0.6-autoconfiscated.patch index a19805f..71b4629 100644 --- a/bzip2-1.0.5-autoconfiscated.patch +++ b/bzip2-1.0.6-autoconfiscated.patch @@ -12,14 +12,14 @@ diff -urN files/autogen.sh ./autogen.sh +autoconf diff -urN bzip2-1.0.5.orig/README.autotools bzip2-1.0.5.autoconfiscated/README.autotools --- bzip2-1.0.5.orig/README.autotools 1970-01-01 01:00:00.000000000 +0100 -+++ bzip2-1.0.5.autoconfiscated/README.autotools 2009-11-05 23:06:27.000000000 +0100 ++++ bzip2-1.0.5.autoconfiscated/README.autotools 2010-11-02 17:04:06.000000000 +0100 @@ -0,0 +1,39 @@ +bzip2 autoconfiscated +===================== + -+Temporarily at http://pack.suse.cz/sbrabec/bzip2/ expecting that it will -+become a new upstream version to prevent per-distribution shared library -+patching done by nearly each Linux vendor separately. ++Temporarily at http://ftp.suse.com/pub/people/sbrabec/bzip2/ expecting ++that it will become a new upstream version to prevent per-distribution ++shared library patching done by nearly each Linux vendor separately. + +Autoconfiscation brings standard ./configure ; make ; make install +installation, seamless support of DESTDIR, automatic check for supported @@ -45,7 +45,7 @@ diff -urN bzip2-1.0.5.orig/README.autotools bzip2-1.0.5.autoconfiscated/README.a + +Incompatible changes: + -+soname change. Libtool has no support for two parts name suffix (e. g. ++soname change. Libtool has no support for two parts soname suffix (e. g. +libbz2.so.1.0). It must be a single number (e. g. libbz2.so.1). That is +why soname must change. But I see not a big problem with it. Several +distributions already use the new number instead of the non-standard @@ -55,7 +55,7 @@ diff -urN bzip2-1.0.5.orig/README.autotools bzip2-1.0.5.autoconfiscated/README.a +both instances of the shared library can live together. diff -urN bzip2-1.0.5.orig/configure.ac bzip2-1.0.5.autoconfiscated/configure.ac --- bzip2-1.0.5.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ bzip2-1.0.5.autoconfiscated/configure.ac 2009-11-06 17:04:04.000000000 +0100 ++++ bzip2-1.0.5.autoconfiscated/configure.ac 2010-11-02 17:53:47.000000000 +0100 @@ -0,0 +1,70 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. @@ -63,7 +63,7 @@ diff -urN bzip2-1.0.5.orig/configure.ac bzip2-1.0.5.autoconfiscated/configure.ac +AC_PREREQ([2.57]) +AC_INIT([bzip2], [1.0.5], [Julian Seward ]) +BZIP2_LT_CURRENT=1 -+BZIP2_LT_REVISION=5 ++BZIP2_LT_REVISION=6 +BZIP2_LT_AGE=0 +AC_CONFIG_SRCDIR([bzlib.h]) +AC_CONFIG_MACRO_DIR([m4]) diff --git a/bzip2.changes b/bzip2.changes index 492ee1d..24a051b 100644 --- a/bzip2.changes +++ b/bzip2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 3 11:43:52 UTC 2010 - puzel@novell.com + +- use new version of autoconfiscate patch (by sbrabec) + ------------------------------------------------------------------- Thu Sep 23 09:27:21 UTC 2010 - puzel@novell.com diff --git a/bzip2.spec b/bzip2.spec index 99ebca0..3e0808c 100644 --- a/bzip2.spec +++ b/bzip2.spec @@ -40,8 +40,8 @@ Source1: bznew.gz Source2: bznew.1.gz Source3: baselibs.conf Source100: rpmlintrc -# PATCH-FEATURE-OPENSUSE bzip2-1.0.5-autoconfiscated.patch sbrabec@suse.cz -- Convert to a standard autoconf based package. -Patch: http://pack.suse.cz/sbrabec/bzip2/for_downstream/bzip2-1.0.5-autoconfiscated.patch +# PATCH-FEATURE-OPENSUSE bzip2-1.0.6-autoconfiscated.patch sbrabec@suse.cz -- Convert to a standard autoconf based package. +Patch: http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch Patch2: bzip2-maxlen20.patch Patch3: bzip2-faster.patch Patch5: bzip2-unsafe_strcpy.patch