From 51157be1dcc0f5d1daab6271f1250d894743a9b8558ca5565e936b59c459ffac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Mon, 29 Nov 2010 15:46:49 +0000
Subject: [PATCH] Accepting request 54092 from home:elvigia:branches:Archiving

OBS-URL: https://build.opensuse.org/request/show/54092
OBS-URL: https://build.opensuse.org/package/show/Archiving/bzip2?expand=0&rev=17
---
 bzip2-1.0.6-autoconfiscated.patch | 66 ++++++++++++++++++++++---------
 bzip2.changes                     |  6 +++
 bzip2.spec                        |  2 +-
 3 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/bzip2-1.0.6-autoconfiscated.patch b/bzip2-1.0.6-autoconfiscated.patch
index 71b4629..b8cdfbb 100644
--- a/bzip2-1.0.6-autoconfiscated.patch
+++ b/bzip2-1.0.6-autoconfiscated.patch
@@ -1,6 +1,5 @@
-diff -urN files/autogen.sh ./autogen.sh
---- bzip2-1.0.5.orig/autogen.sh	1970-01-01 01:00:00.000000000 +0100
-+++ bzip2-1.0.5.autoconfiscated/autogen.sh	2009-11-06 12:10:43.574602171 +0100
+--- /dev/null
++++ autogen.sh
 @@ -0,0 +1,8 @@
 +mv LICENSE COPYING
 +mv CHANGES NEWS
@@ -10,9 +9,8 @@ diff -urN files/autogen.sh ./autogen.sh
 +aclocal
 +automake --add-missing --gnu
 +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	2010-11-02 17:04:06.000000000 +0100
+--- /dev/null
++++ README.autotools
 @@ -0,0 +1,39 @@
 +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
 +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	2010-11-02 17:53:47.000000000 +0100
-@@ -0,0 +1,70 @@
+--- /dev/null
++++ configure.ac
+@@ -0,0 +1,71 @@
 +#                                               -*- Autoconf -*-
 +# 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.
 +AC_PROG_AWK
-+AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
 +AC_PROG_INSTALL
 +AC_PROG_LN_S
 +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_CONFIG_FILES([Makefile bzip2.pc])
 +AC_OUTPUT
-diff -urN bzip2-1.0.5.orig/Makefile.am bzip2-1.0.5.autoconfiscated/Makefile.am
---- bzip2-1.0.5.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ bzip2-1.0.5.autoconfiscated/Makefile.am	2009-11-05 16:45:11.000000000 +0100
+--- /dev/null
++++ Makefile.am
 @@ -0,0 +1,138 @@
 +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 = \
 +	-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
 +
@@ -269,9 +266,8 @@ diff -urN bzip2-1.0.5.orig/Makefile.am bzip2-1.0.5.autoconfiscated/Makefile.am
 +	xmlproc.sh
 +
 +ACLOCAL_AMFLAGS = -I m4
-diff -urN bzip2-1.0.5.orig/bzip2.pc.in bzip2-1.0.5.autoconfiscated/bzip2.pc.in
---- bzip2-1.0.5.orig/bzip2.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ bzip2-1.0.5.autoconfiscated/bzip2.pc.in	2009-11-03 18:48:28.000000000 +0100
+--- /dev/null
++++ bzip2.pc.in
 @@ -0,0 +1,11 @@
 +prefix=@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@
 +Libs: -L${libdir} -lbz2
 +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: *;
++
++};
diff --git a/bzip2.changes b/bzip2.changes
index 24a051b..58491f7 100644
--- a/bzip2.changes
+++ b/bzip2.changes
@@ -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
 
diff --git a/bzip2.spec b/bzip2.spec
index 804273b..0227347 100644
--- a/bzip2.spec
+++ b/bzip2.spec
@@ -104,7 +104,7 @@ Authors:
 
 %prep
 %setup -q
-%patch -p1
+%patch
 %patch2
 %patch3
 %patch5