[gentoo-commits] gentoo-x86 commit in app-arch/rpm/files: rpm-4.8.0-autotools.patch

[Stanislav Ochotnicky (sochotnicky)]

sochotnicky    10/05/05 23:08:14

  Modified:             rpm-4.8.0-autotools.patch
  Log:
  Fixed build failue by removing db3 from AC_CONFIG_SUBDIRS
  it is not needed anyway because we are using external db
  (Portage version: 2.1.8.3/cvs/Linux i686)

Revision  Changes    Path
1.2                  app-arch/rpm/files/rpm-4.8.0-autotools.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/rpm/files/rpm-4.8.0-autotools.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/rpm/files/rpm-4.8.0-autotools.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/rpm/files/rpm-4.8.0-autotools.patch?r1=1.1&r2=1.2

Index: rpm-4.8.0-autotools.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/rpm/files/rpm-4.8.0-autotools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.8.0-autotools.patch	5 May 2010 20:54:04 -0000	1.1
+++ rpm-4.8.0-autotools.patch	5 May 2010 23:08:14 -0000	1.2
@@ -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 @@
  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])