- db_buffer_small patch is needed with db6.0 too (up to 3 retries needed:

[packages/rpm.git] / rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch

diff --git a/rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch b/rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch
index 3bc36433b876b70397f2007d5692632250b5e12f..9dd9a2939fd11fbc66b0fbe5bb62b7037fd3d5cd 100644 (file)
--- a/rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch
+++ b/rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch
@@ -1,16 +1,18 @@
---- rpm-5.4.4/macros/macros.rpmbuild.in.builddir~      2011-12-20 15:36:20.813852241 +0100
-+++ rpm-5.4.4/macros/macros.rpmbuild.in        2011-12-20 15:37:43.385806877 +0100
-@@ -326,8 +326,9 @@ echo "Patch #%{__patch_number} (%{basena
- %___build_args                -e
- %___build_cmd         %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{___build_shell} %{___build_args}
- %___build_pre \
-+  RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
-   RPM_OPT_FLAGS=\"%{optflags}\"\
--  export RPM_OPT_FLAGS\
-+  export RPM_BUILD_DIR RPM_OPT_FLAGS\
-   %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
-   export RPM_BUILD_ROOT}\
-   %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
+macros.rpmbuild fixed with rpm-fix-___build_pre-macro.patch
+
+#--- rpm-5.4.4/macros/macros.rpmbuild.in.builddir~     2011-12-20 15:36:20.813852241 +0100
+#+++ rpm-5.4.4/macros/macros.rpmbuild.in       2011-12-20 15:37:43.385806877 +0100
+#@@ -326,8 +326,9 @@ echo "Patch #%{__patch_number} (%{basena
+# %___build_args               -e
+# %___build_cmd                %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{___build_shell} %{___build_args}
+# %___build_pre        \
+#+  RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
+#   RPM_OPT_FLAGS=\"%{optflags}\"\
+#-  export RPM_OPT_FLAGS\
+#+  export RPM_BUILD_DIR RPM_OPT_FLAGS\
+#   %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
+#   export RPM_BUILD_ROOT}\
+#   %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
 --- rpm-5.4.4/scripts/find-debuginfo.sh.builddir~      2011-12-20 15:36:31.962846125 +0100
 +++ rpm-5.4.4/scripts/find-debuginfo.sh        2011-12-20 15:36:49.492836503 +0100
 @@ -32,7 +32,6 @@ strip_r=false