From cb0144b972ec23a757ac1aa2bb9e702e01bff6a9 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 11 May 2010 00:00:12 +0200 Subject: Few fixes for rpm-4.8.0 --- app-arch/rpm/Manifest | 5 ++-- app-arch/rpm/files/rpm-4.8.0-autotools.patch | 34 ++++++++-------------------- app-arch/rpm/files/rpm-4.8.0-db-path.patch | 26 +++++++++++++++++++++ app-arch/rpm/rpm-4.8.0.ebuild | 13 ++++++----- 4 files changed, 45 insertions(+), 33 deletions(-) create mode 100644 app-arch/rpm/files/rpm-4.8.0-db-path.patch diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 386a53d..9586515 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,5 +1,6 @@ -AUX rpm-4.8.0-autotools.patch 1296 RMD160 d099b5ea3eac326bc38355c12eae24c011c41f6e SHA1 450879394e1b101b55853051f355babb900c1faa SHA256 a176b4413242170d02dea0c2a4ba05a642d03aa7329aa43f1c8984ff7e580a4b +AUX rpm-4.8.0-autotools.patch 929 RMD160 9b4b1b08e38f79522a5b1e6ab487ed89b8234add SHA1 f20c1d98d325efa64f54b046cda6a8b5d4463da4 SHA256 2280de624d171399bb48dd4ae9144063ae4ab17f87e57313ba664a234a90e512 +AUX rpm-4.8.0-db-path.patch 628 RMD160 cee347c45bbbebd724dd1346bd74b3344b6a7d06 SHA1 08c3aa65104db74c9851911970711b2f503dfcc8 SHA256 791682c72dd3a24e5e8268bfa967412035aa135c7b8d4673541bed129b89a0f3 DIST rpm-4.8.0.tar.bz2 3692408 RMD160 3d3d20a81e6f2f06f9cd6e9a02978070ea665a2d SHA1 84210ab42f36ad6b3d856c86a974a5178d1de864 SHA256 a3b4bb2d78eaf1f5200fdcd51372ca9cedce64e030046372e6a13e361cb82b64 -EBUILD rpm-4.8.0.ebuild 2027 RMD160 6793647130a63d3ac621ff8c7fdedff805d2fea5 SHA1 0b88cfd131da9939b7aab08ef4865ae08a3f597d SHA256 84b03cff08a70ae3cd04f48f83688ee901d26603890b900e5f3a1db3dcc332e8 +EBUILD rpm-4.8.0.ebuild 2113 RMD160 cee88118ad9a9e8c73b104e596f74a30445719eb SHA1 ccb43ffb916072e4e456e29614e0d59f35a2916e SHA256 9a2fcb086a7ad6a2b9d54f34224e176d7f1aa69851abce2c88fb51e10617460e MISC ChangeLog 16768 RMD160 7bd4a9458998ca2dc26e509a6fcf625a720ffbeb SHA1 e229e1939589bd73189b669797cf71f18847c69c SHA256 6862fed939a70270c6eb0942d1f390d229d629e10b8eab22603726f7fbe989a0 MISC metadata.xml 333 RMD160 68d3a522b6f8f9414004359b46ce85b62bc968de SHA1 02af812e71a2b3e588b7152b3ac6308fee1e3e29 SHA256 895cc972d28e0f9b12e68dbc496b9cfc3b537e52b55372cc40ba1ae8902bf0e8 diff --git a/app-arch/rpm/files/rpm-4.8.0-autotools.patch b/app-arch/rpm/files/rpm-4.8.0-autotools.patch index d4016be..21cf254 100644 --- a/app-arch/rpm/files/rpm-4.8.0-autotools.patch +++ b/app-arch/rpm/files/rpm-4.8.0-autotools.patch @@ -1,18 +1,5 @@ -diff --git a/Makefile.am b/Makefile.am -index 587cfa7..498abfb 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in - - usrsrcdir = $(prefix)/src - --rpmvardir = $(localstatedir)/lib/rpm -+rpmvardir = $(localstatedir)/rpm - rpmvar_DATA = - - install-exec-hook: diff --git a/configure.ac b/configure.ac -index 8c2ef50..1ec8978 100644 +index 8c2ef50..2fc75f3 100644 --- a/configure.ac +++ b/configure.ac @@ -305,14 +305,9 @@ AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes]) @@ -33,16 +20,13 @@ index 8c2ef50..1ec8978 100644 AC_SUBST(WITH_NSS_INCLUDE) AC_SUBST(WITH_NSS_LIB) -diff --git a/macros.in b/macros.in -index ae46fcb..213b53c 100644 ---- a/macros.in -+++ b/macros.in -@@ -155,7 +155,7 @@ - %_bzip2bin %{__bzip2} +@@ -1014,9 +1009,6 @@ AC_SUBST(RPMCONFIGDIR) + + AC_SUBST(OBJDUMP) - # The location of the rpm database file(s). --%_dbpath %{_var}/lib/rpm -+%_dbpath %{_var}/rpm +-if test "$with_external_db" = no; then +- AC_CONFIG_SUBDIRS(db3) +-fi - # The location of the rpm database file(s) after "rpm --rebuilddb". - %_dbpath_rebuild %{_dbpath} + AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no]) + AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no]) diff --git a/app-arch/rpm/files/rpm-4.8.0-db-path.patch b/app-arch/rpm/files/rpm-4.8.0-db-path.patch new file mode 100644 index 0000000..634dd23 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.8.0-db-path.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile.am b/Makefile.am +index 587cfa7..498abfb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in + + usrsrcdir = $(prefix)/src + +-rpmvardir = $(localstatedir)/lib/rpm ++rpmvardir = $(localstatedir)/rpm + rpmvar_DATA = + + install-exec-hook: +diff --git a/macros.in b/macros.in +index ae46fcb..213b53c 100644 +--- a/macros.in ++++ b/macros.in +@@ -155,7 +155,7 @@ + %_bzip2bin %{__bzip2} + + # The location of the rpm database file(s). +-%_dbpath %{_var}/lib/rpm ++%_dbpath %{_var}/rpm + + # The location of the rpm database file(s) after "rpm --rebuilddb". + %_dbpath_rebuild %{_dbpath} diff --git a/app-arch/rpm/rpm-4.8.0.ebuild b/app-arch/rpm/rpm-4.8.0.ebuild index 1a317eb..5cd3df6 100644 --- a/app-arch/rpm/rpm-4.8.0.ebuild +++ b/app-arch/rpm/rpm-4.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.8.0.ebuild,v 1.3 2010/05/06 22:45:44 sochotnicky Exp $ EAPI=2 @@ -14,7 +14,7 @@ LICENSE="GPL-2 LGPL-2" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="nls python doc sqlite capabilities lua acl" +IUSE="nls python doc sqlite caps lua acl" RDEPEND="=sys-libs/db-4.5* >=sys-libs/zlib-1.2.3-r1 @@ -29,7 +29,7 @@ RDEPEND="=sys-libs/db-4.5* sqlite? ( >=dev-db/sqlite-3.3.5 ) lua? ( >=dev-lang/lua-5.1.0 ) acl? ( virtual/acl ) - capabilities? ( >=sys-libs/libcap-2.0 )" + caps? ( >=sys-libs/libcap-2.0 )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) @@ -37,8 +37,9 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-autotools.patch + epatch "${FILESDIR}"/${P}-db-path.patch - AT_NO_RECURSIVE="yes" eautoreconf + eautoreconf } src_compile() { @@ -54,7 +55,7 @@ src_configure() { $(use_enable sqlite sqlite3) \ $(use_enable nls) \ $(use_with lua) \ - $(use_with capabilities cap)\ + $(use_with caps cap)\ $(use_with acl)\ || die "econf failed" } @@ -69,7 +70,7 @@ src_install() { keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD} - dodoc CHANGES CREDITS GROUPS README* RPM* + dodoc CHANGES CREDITS GROUPS README* use doc && dohtml -r apidocs/html/* # Fix perllocal.pod file collision -- cgit v1.2.3-65-gdbad