rpms/libtar/devel libtar-macro.patch, NONE, 1.1 libtar.spec, 1.16, 1.17

[Štěpán Kasal]

Author: kasal

Update of /cvs/extras/rpms/libtar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6330

Modified Files:
	libtar.spec 
Added Files:
	libtar-macro.patch 
Log Message:
- fix up so that it builds again (#511566)

libtar-macro.patch:
 configure.ac |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE libtar-macro.patch ---
2009-09-22  Stepan Kasal  <skasal at redhat.com>

	* tell aclocal where are the macros

--- libtar-1.2.11/configure.ac.macro	2009-09-22 14:47:07.000000000 +0200
+++ libtar-1.2.11/configure.ac	2009-09-22 14:50:34.000000000 +0200
@@ -2,6 +2,7 @@
 AC_INIT([libtar], [1.2.11])
 AC_PREREQ([2.57])
 AC_CONFIG_AUX_DIR([autoconf])
+AC_CONFIG_MACRO_DIR([autoconf])
 AC_CONFIG_HEADERS([config.h])
 AC_COPYRIGHT([[
 Copyright (c) 1998-2003 University of Illinois Board of Trustees


Index: libtar.spec
===================================================================
RCS file: /cvs/extras/rpms/libtar/devel/libtar.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libtar.spec	25 Jul 2009 08:43:52 -0000	1.16
+++ libtar.spec	22 Sep 2009 15:07:53 -0000	1.17
@@ -1,13 +1,14 @@
 Summary:        Tar file manipulation API
 Name:           libtar
 Version:        1.2.11
-Release:        13%{?dist}
+Release:        14%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.feep.net/libtar/
 Source0:        ftp://ftp.feep.net/pub/software/libtar/libtar-%{version}.tar.gz
 Patch0:         http://ftp.debian.org/debian/pool/main/libt/libtar/libtar_1.2.11-4.diff.gz
 Patch1:         libtar-1.2.11-missing-protos.patch
+Patch2:         libtar-macro.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  zlib-devel libtool
 
@@ -31,18 +32,25 @@ developing applications that use %{name}
 %setup -q
 %patch0 -p1 -z .deb
 %patch1 -p1
+%patch2 -p1
 # set correct version for .so build
 %define ltversion %(echo %{version} | tr '.' ':')
 sed -i 's/-rpath $(libdir)/-rpath $(libdir) -version-number %{ltversion}/' \
   lib/Makefile.in
+# sanitize the macro definitions so that aclocal can find them:
+cd autoconf
+sed '/^m4_include/d;s/ m4_include/ m4][_include/g' aclocal.m4 >psg.m4
+rm acsite.m4 aclocal.m4
+cd ..
 
 
 %build
-cp /usr/share/libtool/config.sub /usr/share/libtool/ltmain.sh autoconf
+cp -p /usr/share/libtool/config/config.sub autoconf
+# config.guess is not needed, macro %%configure specifies --build
+libtoolize --copy
+aclocal -I autoconf
+autoconf
 %configure --disable-static
-# Don't use rpath!
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
@@ -77,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 22 2009 Stepan Kasal <skasal at redhat.com> - 1.2.11-14
+- fix up so that it builds again (#511566)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.11-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild