- changed path for gconftool, due problems depended on _destdir variable

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

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index 18a0d155c8df8253465980952d1b0947b5bf0df2..71901c907bf1fcbe1c6f7c78c213c8342566c4c4 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -6,14 +6,9 @@ diff -Nru rpm-4.0.1/rpmrc.in rpm-4.0.1.new/rpmrc.in
  
  # XXX this is the i386 optflags that rpm has traditionally used in the past.
 -#optflags: i386 -O2 -m486 -fno-strength-reduce
-+#optflags: i386 -O2 -march=i386
- optflags: i386 -O2 -march=i386 -mcpu=i686
+-optflags: i386 -O2 -march=i386 -mcpu=i686
++optflags: i386 -O2 -march=i386
++#optflags: i386 -O2 -march=i386 -mcpu=i686
  optflags: i486 -O2 -march=i486
  optflags: i586 -O2 -march=i586
-@@ -289,5 +289,5 @@
- buildarch_compat: ia64: noarch
- buildarch_compat: s390: noarch
- 
--macrofiles:   @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros.db1:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
-+macrofiles:   @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/macros.pld:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros.db1:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros