From d008c70b9bebce5f44b78851b9b18a891e221390 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@fedoraproject.org>
Date: Jun 14 2010 18:46:19 +0000
Subject: - Rebuild libtalloc from the samba3x sources

- Remove Conflicts: samba3x

---

diff --git a/.cvsignore b/.cvsignore
index c29bb86..85256b2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
+libtalloc-1.2.0.tar.gz
 talloc-2.0.1.tar.gz
diff --git a/libtalloc.spec b/libtalloc.spec
index 9e3c949..b8691f1 100644
--- a/libtalloc.spec
+++ b/libtalloc.spec
@@ -1,19 +1,27 @@
+%global compat_version 1.2.0
+
 Name: libtalloc
 Version: 2.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Daemons
 Summary: The talloc library
 License: LGPLv3+
 URL: http://talloc.samba.org/
-Source: http://samba.org/ftp/talloc/talloc-%{version}.tar.gz
+Source0: http://samba.org/ftp/talloc/talloc-%{version}.tar.gz
+
+# For compatibility with samba3x, we will rebuild the vesion of
+# libtalloc.so.1 from the samba3x sources.
+# The tarball is created with generate-talloc1-tarball.sh
+# The original samba source tarball is:
+# http://www.samba.org/samba/ftp/samba/samba-3.3.12.tar.gz
+Source1: generate-talloc1-tarball.sh
+Source2: libtalloc-%{compat_version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: autoconf
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
 
-Conflicts: samba3x-common
-
 %description
 A library that implements a hierarchical allocator with destructors.
 
@@ -27,23 +35,36 @@ Header files needed to develop programs that link against the Talloc library.
 
 %prep
 %setup -q -n talloc-%{version}
+%setup -q -T -D -b 2 -n libtalloc-%{compat_version}
 
 %build
+cd $RPM_BUILD_DIR/talloc-%{version}
+./autogen.sh
+%configure
+make %{?_smp_mflags}
+
+cd $RPM_BUILD_DIR/libtalloc-%{compat_version}/talloc
 ./autogen.sh
-%configure --enable-talloc-compat1
+%configure
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# Compatibility library
+cd $RPM_BUILD_DIR/libtalloc-%{compat_version}/talloc
+make install DESTDIR=$RPM_BUILD_ROOT
+ln -s libtalloc.so.%{compat_version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1
+
+# Main library
+# Some files installed by the compatibility library will be overwritten
+# This is intentional
+cd $RPM_BUILD_DIR/talloc-%{version}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 ln -s libtalloc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.2
 ln -s libtalloc.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
 
-#Compatibility library
-ln -s libtalloc-compat1-%{version}.so $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.a
 rm -f $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i
 
@@ -54,7 +75,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libtalloc.so.*
-%{_libdir}/libtalloc-compat1-%{version}.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -68,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Jun 14 2010 Stephen Gallagher <sgallagh@redhat.com> - 2.0.1-4
+- Rebuild libtalloc from the samba3x sources
+- Remove Conflicts: samba3x
+
 * Thu May 27 2010 Stephen Gallagher <sgallagh@redhat.com> - 2.0.1-3
 - Mark libtalloc as conflicting with samba3x
 - The custom version of libtalloc required by samba3x is custom and
diff --git a/sources b/sources
index 24f864a..16537f3 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+2f87ce7a271a54a8985304d8c2385cb2  libtalloc-1.2.0.tar.gz
 c6e736540145ca58cb3dcb42f91cf57b  talloc-2.0.1.tar.gz