diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-19 10:37:02 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-19 10:37:02 +0000 |
| commit | 526cb2358ca64be332a06b20bc5ce6fc1a15e892 (patch) | |
| tree | adfc3ff69d3054c11c357a71bb486f5f4850f2d1 /app-arch | |
| parent | Remove old. (diff) | |
| download | gentoo-2-526cb2358ca64be332a06b20bc5ce6fc1a15e892.tar.gz gentoo-2-526cb2358ca64be332a06b20bc5ce6fc1a15e892.tar.bz2 gentoo-2-526cb2358ca64be332a06b20bc5ce6fc1a15e892.zip | |
Version bump the libexecdir patch as I forgot to update one more place that uses /usr/lib hardcoded. Resolves bug#409729.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/rpm/ChangeLog | 9 | ||||
| -rw-r--r-- | app-arch/rpm/files/rpm-4.9.1.2-libdir.patch | 22 | ||||
| -rw-r--r-- | app-arch/rpm/rpm-4.9.1.2-r2.ebuild (renamed from app-arch/rpm/rpm-4.9.1.2-r1.ebuild) | 2 |
3 files changed, 29 insertions, 4 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog index 7cabca6d26b2..264322b165a1 100644 --- a/app-arch/rpm/ChangeLog +++ b/app-arch/rpm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/rpm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.137 2012/03/24 17:24:42 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.138 2012/04/19 10:37:02 scarabeus Exp $ + +*rpm-4.9.1.2-r2 (19 Apr 2012) + + 19 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> +rpm-4.9.1.2-r2.ebuild, + -rpm-4.9.1.2-r1.ebuild, files/rpm-4.9.1.2-libdir.patch: + Version bump the libexecdir patch as I forgot to update one more place that + uses /usr/lib hardcoded. Resolves bug#409729. 24 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> rpm-4.9.1.2.ebuild: x86 stable wrt bug #406479 diff --git a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch index 2867de86e8e1..221926494411 100644 --- a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch +++ b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch @@ -1,6 +1,24 @@ +diff -urN rpm-4.9.1.2.old/configure.ac rpm-4.9.1.2/configure.ac +--- rpm-4.9.1.2.old/configure.ac 2012-04-19 12:18:27.584725220 +0200 ++++ rpm-4.9.1.2/configure.ac 2012-04-19 12:34:50.302722933 +0200 +@@ -846,13 +846,7 @@ + AC_SUBST(RPMCANONGNU) + AC_DEFINE_UNQUOTED([RPMCANONVENDOR],["${RPMCANONVENDOR}"],[canonical vendor]) + +-if test X"$prefix" = XNONE ; then +- usrprefix="$ac_default_prefix" +-else +- usrprefix=$prefix +-fi +- +-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" ++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`" + AC_SUBST(RPMCONFIGDIR) + + AC_SUBST(OBJDUMP) diff -urN rpm-4.9.1.2.old/rpm.am rpm-4.9.1.2/rpm.am ---- rpm-4.9.1.2.old/rpm.am 2012-03-21 19:57:33.942448288 +0100 -+++ rpm-4.9.1.2/rpm.am 2012-03-21 20:06:19.045419773 +0100 +--- rpm-4.9.1.2.old/rpm.am 2012-04-19 12:18:27.584725220 +0200 ++++ rpm-4.9.1.2/rpm.am 2012-04-19 12:24:49.035724332 +0200 @@ -1,7 +1,5 @@ # Internal binaries -## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm diff --git a/app-arch/rpm/rpm-4.9.1.2-r1.ebuild b/app-arch/rpm/rpm-4.9.1.2-r2.ebuild index d8aa363d5294..deac8965f4cc 100644 --- a/app-arch/rpm/rpm-4.9.1.2-r1.ebuild +++ b/app-arch/rpm/rpm-4.9.1.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.2-r1.ebuild,v 1.1 2012/03/21 19:19:35 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.2-r2.ebuild,v 1.1 2012/04/19 10:37:02 scarabeus Exp $ EAPI=4 |