rpm/bzip2
SHA256
1
0
Fork 0
forked from pool/bzip2
Code Pull Requests Activity

Accepting request 54095 from Archiving

Browse Source 
Accepted submit request 54095 from user elvigia

OBS-URL: https://build.opensuse.org/request/show/54095
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bzip2?expand=0&rev=30
This commit is contained in:
Berthold Gunreben 2010-11-30 10:08:25 +00:00 committed by Git OBS Bridge
commit 480dc9eace
3 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
bzip2-1.0.6-autoconfiscated.patch
View File

@ -1,6 +1,5 @@
diff -urN files/autogen.sh ./autogen.sh --- /dev/null
--- bzip2-1.0.5.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 +++ autogen.sh
+++ bzip2-1.0.5.autoconfiscated/autogen.sh 2009-11-06 12:10:43.574602171 +0100
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+mv LICENSE COPYING +mv LICENSE COPYING
+mv CHANGES NEWS +mv CHANGES NEWS
@ -10,9 +9,8 @@ diff -urN files/autogen.sh ./autogen.sh
+aclocal +aclocal
+automake --add-missing --gnu +automake --add-missing --gnu
+autoconf +autoconf
diff -urN bzip2-1.0.5.orig/README.autotools bzip2-1.0.5.autoconfiscated/README.autotools --- /dev/null
--- bzip2-1.0.5.orig/README.autotools 1970-01-01 01:00:00.000000000 +0100 +++ README.autotools
+++ bzip2-1.0.5.autoconfiscated/README.autotools 2010-11-02 17:04:06.000000000 +0100
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+bzip2 autoconfiscated +bzip2 autoconfiscated
+===================== +=====================
@ -53,10 +51,9 @@ diff -urN bzip2-1.0.5.orig/README.autotools bzip2-1.0.5.autoconfiscated/README.a
+ +
+To be super-safe, I incremented minor number of the library file, so +To be super-safe, I incremented minor number of the library file, so
+both instances of the shared library can live together. +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 --- /dev/null
--- bzip2-1.0.5.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ configure.ac
+++ bzip2-1.0.5.autoconfiscated/configure.ac 2010-11-02 17:53:47.000000000 +0100 @@ -0,0 +1,71 @@
@@ -0,0 +1,70 @@
+# -*- Autoconf -*- +# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script. +# Process this file with autoconf to produce a configure script.
+ +
@ -73,7 +70,8 @@ diff -urN bzip2-1.0.5.orig/configure.ac bzip2-1.0.5.autoconfiscated/configure.ac
+ +
+# Checks for programs. +# Checks for programs.
+AC_PROG_AWK +AC_PROG_AWK
+AC_PROG_CC +AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_PROG_INSTALL +AC_PROG_INSTALL
+AC_PROG_LN_S +AC_PROG_LN_S
+AC_PROG_MAKE_SET +AC_PROG_MAKE_SET
@ -127,9 +125,8 @@ diff -urN bzip2-1.0.5.orig/configure.ac bzip2-1.0.5.autoconfiscated/configure.ac
+AC_SUBST([BZIP2_LT_AGE]) +AC_SUBST([BZIP2_LT_AGE])
+AC_CONFIG_FILES([Makefile bzip2.pc]) +AC_CONFIG_FILES([Makefile bzip2.pc])
+AC_OUTPUT +AC_OUTPUT
diff -urN bzip2-1.0.5.orig/Makefile.am bzip2-1.0.5.autoconfiscated/Makefile.am --- /dev/null
--- bzip2-1.0.5.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ Makefile.am
+++ bzip2-1.0.5.autoconfiscated/Makefile.am 2009-11-05 16:45:11.000000000 +0100
@@ -0,0 +1,138 @@ @@ -0,0 +1,138 @@
+lib_LTLIBRARIES = libbz2.la +lib_LTLIBRARIES = libbz2.la
+ +
@ -144,7 +141,7 @@ diff -urN bzip2-1.0.5.orig/Makefile.am bzip2-1.0.5.autoconfiscated/Makefile.am
+ +
+libbz2_la_LDFLAGS = \ +libbz2_la_LDFLAGS = \
+ -version-info $(BZIP2_LT_CURRENT):$(BZIP2_LT_REVISION):$(BZIP2_LT_AGE) \ + -version-info $(BZIP2_LT_CURRENT):$(BZIP2_LT_REVISION):$(BZIP2_LT_AGE) \
+ -no-undefined + -no-undefined -Wl,--version-script=$(srcdir)/libbz2.map
+ +
+include_HEADERS = bzlib.h +include_HEADERS = bzlib.h
+ +
@ -269,9 +266,8 @@ diff -urN bzip2-1.0.5.orig/Makefile.am bzip2-1.0.5.autoconfiscated/Makefile.am
+ xmlproc.sh + xmlproc.sh
+ +
+ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4
diff -urN bzip2-1.0.5.orig/bzip2.pc.in bzip2-1.0.5.autoconfiscated/bzip2.pc.in --- /dev/null
--- bzip2-1.0.5.orig/bzip2.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ bzip2.pc.in
+++ bzip2-1.0.5.autoconfiscated/bzip2.pc.in 2009-11-03 18:48:28.000000000 +0100
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+prefix=@prefix@ +prefix=@prefix@
+exec_prefix=@exec_prefix@ +exec_prefix=@exec_prefix@
@ -284,3 +280,37 @@ diff -urN bzip2-1.0.5.orig/bzip2.pc.in bzip2-1.0.5.autoconfiscated/bzip2.pc.in
+Version: @VERSION@ +Version: @VERSION@
+Libs: -L${libdir} -lbz2 +Libs: -L${libdir} -lbz2
+Cflags: -I${includedir} +Cflags: -I${includedir}
--- /dev/null
+++ libbz2.map
@@ -0,0 +1,31 @@
+{
+global:
+
+ BZ2_bzBuffToBuffCompress;
+ BZ2_bzBuffToBuffDecompress;
+ BZ2_bzCompress;
+ BZ2_bzCompressEnd;
+ BZ2_bzCompressInit;
+ BZ2_bzDecompress;
+ BZ2_bzDecompressEnd;
+ BZ2_bzDecompressInit;
+ BZ2_bzRead;
+ BZ2_bzReadClose;
+ BZ2_bzReadGetUnused;
+ BZ2_bzReadOpen;
+ BZ2_bzWrite;
+ BZ2_bzWriteClose;
+ BZ2_bzWriteClose64;
+ BZ2_bzWriteOpen;
+ BZ2_bzclose;
+ BZ2_bzdopen;
+ BZ2_bzerror;
+ BZ2_bzflush;
+ BZ2_bzlibVersion;
+ BZ2_bzopen;
+ BZ2_bzread;
+ BZ2_bzwrite;
+
+local: *;
+
+};

6
bzip2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 29 14:33:39 UTC 2010 - cristian.rodriguez@opensuse.org
- extend bzip2-1.0.6-autoconfiscated.patch to support
an LD version script so we export only public symbols
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 3 11:43:52 UTC 2010 - puzel@novell.com Wed Nov 3 11:43:52 UTC 2010 - puzel@novell.com

2
bzip2.spec
View File

@ -104,7 +104,7 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch -p1 %patch
%patch2 %patch2
%patch3 %patch3
%patch5 %patch5