- fixed (finally?) GConf scripts, rel 0.6

[packages/rpm.git] / rpm-libdir64.patch

diff --git a/rpm-libdir64.patch b/rpm-libdir64.patch
index 66fed37b213a01d0b819250506b6448e14c8ae8b..a19c2cd4eab6b4c8b4031f94c2447b6e694075f7 100644 (file)
--- a/rpm-libdir64.patch
+++ b/rpm-libdir64.patch
@@ -11,24 +11,3 @@ diff -x '*~' -durN rpm-4.3.orig/configure.ac rpm-4.3/configure.ac
  AC_SUBST(MARK64)
  
  dnl Determine the canonical arch-vendor-os for the build machine
-@@ -1234,7 +1231,7 @@
- AC_SUBST(LOCALEDIR)
- LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
- AC_SUBST(LIBDIR)
--RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
-+RPMCONFIGDIR="`echo ${libdir}/rpm`"
- AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR",
-       [Full path to rpm global configuration directory (usually /usr/lib/rpm)])
- AC_SUBST(RPMCONFIGDIR)
-diff -x '*~' -durN rpm-4.3.orig/scripts/Makefile.am rpm-4.3/scripts/Makefile.am
---- rpm-4.3.orig/scripts/Makefile.am   2003-03-25 13:49:47.000000000 +0100
-+++ rpm-4.3/scripts/Makefile.am        2004-12-19 09:24:37.808321672 +0100
-@@ -21,7 +21,7 @@
- 
- all:
- 
--configdir = ${prefix}/lib/rpm
-+configdir = @RPMCONFIGDIR@
- config_SCRIPTS = \
-       brp-compress brp-redhat brp-strip brp-strip-comment-note \
-       brp-strip-shared brp-strip-static-archive brp-sparc64-linux \