diff options
| -rw-r--r-- | app-arch/rpm/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/rpm/files/rpm-4.2.1-lib64.patch | 81 | ||||
| -rw-r--r-- | app-arch/rpm/rpm-4.2.1.ebuild | 3 |
3 files changed, 88 insertions, 2 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog index 83baf133247c..9400e830725f 100644 --- a/app-arch/rpm/ChangeLog +++ b/app-arch/rpm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/rpm # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.44 2005/04/06 18:46:21 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.45 2005/04/09 09:31:17 blubb Exp $ + + 09 Apr 2005; Simon Stelling <blubb@gentoo.org> + +files/rpm-4.2.1-lib64.patch, rpm-4.2.1.ebuild: + applied Chris Parrott's patch to fix bug #81982 06 Apr 2005; Markus Rothe <corsair@gentoo.org> rpm-4.2.1.ebuild: Stable on ppc64 diff --git a/app-arch/rpm/files/rpm-4.2.1-lib64.patch b/app-arch/rpm/files/rpm-4.2.1-lib64.patch new file mode 100644 index 000000000000..27bd872cab05 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.2.1-lib64.patch @@ -0,0 +1,81 @@ +diff -uNr rpm-4.2.1.orig/configure rpm-4.2.1/configure +--- rpm-4.2.1.orig/configure 2005-04-03 11:36:20.000000000 -0500 ++++ rpm-4.2.1/configure 2005-04-03 17:45:48.000000000 -0500 +@@ -23477,9 +23477,9 @@ + fi + + MARK64= +-case "${target_cpu}" in +-x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;; +-esac ++#case "${target_cpu}" in ++#x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;; ++#esac + + + autorelocate_path='%{nil}' +@@ -23538,7 +23538,7 @@ + + LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`" + +-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" ++RPMCONFIGDIR="`echo ${libdir}/rpm`" + + cat >>confdefs.h <<_ACEOF + #define RPMCONFIGDIR "$RPMCONFIGDIR" +diff -uNr rpm-4.2.1.orig/file/Makefile.in rpm-4.2.1/file/Makefile.in +--- rpm-4.2.1.orig/file/Makefile.in 2003-07-16 12:05:23.000000000 -0500 ++++ rpm-4.2.1/file/Makefile.in 2005-04-03 18:34:54.000000000 -0500 +@@ -39,7 +39,7 @@ + + #MAGIC = @datadir@/magic + #data_DATA = magic magic.mime magic.mgc magic.mime.mgc +-pkglibdir = @prefix@/lib/rpm ++pkglibdir = ${libdir}/rpm + ACLOCAL = @ACLOCAL@ + AMDEP_FALSE = @AMDEP_FALSE@ + AMDEP_TRUE = @AMDEP_TRUE@ +diff -uNr rpm-4.2.1.orig/file/configure rpm-4.2.1/file/configure +--- rpm-4.2.1.orig/file/configure 2005-04-03 11:36:20.000000000 -0500 ++++ rpm-4.2.1/file/configure 2005-04-03 13:57:28.000000000 -0500 +@@ -8005,9 +8005,9 @@ + export CFLAGS + + MARK64= +-case "${target_cpu}" in +-x86_64*) MARK64=64 ;; +-esac ++#case "${target_cpu}" in ++#x86_64*) MARK64=64 ;; ++#esac + + + echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +diff -uNr rpm-4.2.1.orig/popt/configure rpm-4.2.1/popt/configure +--- rpm-4.2.1.orig/popt/configure 2005-04-03 11:36:20.000000000 -0500 ++++ rpm-4.2.1/popt/configure 2005-04-03 13:58:23.000000000 -0500 +@@ -9382,9 +9382,9 @@ + + + MARK64= +-case "${target_cpu}" in +-x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;; +-esac ++#case "${target_cpu}" in ++#x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;; ++#esac + + + +diff -uNr rpm-4.2.1.orig/scripts/Makefile.in rpm-4.2.1/scripts/Makefile.in +--- rpm-4.2.1.orig/scripts/Makefile.in 2003-07-16 12:05:49.000000000 -0500 ++++ rpm-4.2.1/scripts/Makefile.in 2005-04-03 18:11:06.000000000 -0500 +@@ -273,7 +273,7 @@ + + installprefix = $(DESTDIR) + +-configdir = ${prefix}/lib/rpm ++configdir = ${libdir}/rpm + config_SCRIPTS = \ + brp-compress brp-python-bytecompile brp-redhat \ + brp-strip brp-strip-comment-note \ diff --git a/app-arch/rpm/rpm-4.2.1.ebuild b/app-arch/rpm/rpm-4.2.1.ebuild index 3134a6bd7c50..3ef6d071da58 100644 --- a/app-arch/rpm/rpm-4.2.1.ebuild +++ b/app-arch/rpm/rpm-4.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.1.ebuild,v 1.23 2005/04/06 18:46:21 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.1.ebuild,v 1.24 2005/04/09 09:31:17 blubb Exp $ inherit python flag-o-matic libtool eutils @@ -27,6 +27,7 @@ RDEPEND="=sys-libs/db-3.2* src_unpack() { unpack ${A} epatch ${FILESDIR}/rpm-4.2.1-python2.3.diff + epatch ${FILESDIR}/${P}-lib64.patch } src_compile() { |