commit 480435db45e1073681cae3b138bc0fb7139e26bb
Author: Jan Rękorajski <[email protected]>
Date: Sat Sep 15 19:40:24 2012 +0200
- resolve conflicts between patches
...pass-_builddir-properly-to-find-debuginfo.patch | 28 ++++++++++++----------
rpm-fix-___build_pre-macro.patch | 6 ++---
2 files changed, 18 insertions(+), 16 deletions(-)
---
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 3bc3643..9dd9a29 100644
--- 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
diff --git a/rpm-fix-___build_pre-macro.patch b/rpm-fix-___build_pre-macro.patch
index 235c94d..4dc7336 100644
--- a/rpm-fix-___build_pre-macro.patch
+++ b/rpm-fix-___build_pre-macro.patch
@@ -1,13 +1,13 @@
--- rpm-5.4.10/macros/macros.rpmbuild.in.old 2012-09-15 19:31:55.178325519
+0200
+++ rpm-5.4.10/macros/macros.rpmbuild.in 2012-09-15 19:32:37.158324039
+0200
-@@ -324,9 +324,18 @@
+@@ -324,8 +324,18 @@
%___build_args -e
%___build_cmd %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost}
}%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot}
}%{___build_shell} %{___build_args}
%___build_pre \
+ RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
- RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
++ RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
RPM_OPT_FLAGS=\"%{optflags}\"\
-- export RPM_BUILD_DIR RPM_OPT_FLAGS\
+- export RPM_OPT_FLAGS\
+ RPM_ARCH=\"%{_arch}\"\
+ RPM_OS=\"%{_os}\"\
+ export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/480435db45e1073681cae3b138bc0fb7139e26bb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
