[packages/rpm] - fix http://rpm5.org/cvs/tktview?tn=41

[baggins]

commit 46f50d304cb4c8e2a9fcd2328ab7f4ee189d14a8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Sep 15 20:18:40 2012 +0200

    - fix http://rpm5.org/cvs/tktview?tn=41

 rpm-missing-patch-file-fails-build.patch | 13 +++++++++++++
 rpm.spec                                 |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index a41c09d..491ad36 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -4,7 +4,6 @@
 # - add macros for some ppc, mipsel, alpha and sparc
 # - make %%patch not multiline, so plain comment char could still work:
 #   http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/5d3a3ea257d7f88e59d0ad93c20cc8448fb42f3d
-# - http://rpm5.org/cvs/tktview?tn=41&_submit=Show
 #
 # - when adopting, use 4.5 ticket for checklist: https://bugs.launchpad.net/pld-linux/+bug/262985
 #
@@ -127,6 +126,7 @@ Patch43:	%{name}-fix--p-interpreter-and-empty-script.patch
 Patch44:	%{name}-db_buffer_small.patch
 Patch45:	%{name}-pattern_Release.patch
 Patch46:	%{name}-fix-___build_pre-macro.patch
+Patch47:	%{name}-missing-patch-file-fails-build.patch
 
 # Patches imported from Mandriva
 
@@ -794,6 +794,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch44 -p1
 %patch45 -p1
 %patch46 -p1
+%patch47 -p1
 
 %patch1000 -p1
 %patch1001 -p1
diff --git a/rpm-missing-patch-file-fails-build.patch b/rpm-missing-patch-file-fails-build.patch
new file mode 100644
index 0000000..9264614
--- /dev/null
+++ b/rpm-missing-patch-file-fails-build.patch
@@ -0,0 +1,13 @@
+Fix for http://rpm5.org/cvs/tktview?tn=41
+
+--- rpm-5.4.10/macros/macros.rpmbuild.in~	2012-07-06 17:39:16.000000000 +0200
++++ rpm-5.4.10/macros/macros.rpmbuild.in	2012-09-15 20:15:30.455784728 +0200
+@@ -169,7 +169,7 @@
+ %define __patch_suffix  %{-b:-b --suffix %{-b*}} %{-z:--suffix %{-z*}} \
+ %define __patch_fuzz    %{?_default_patch_fuzz:%(test %{_default_patch_fuzz} -ge 0 && echo "--fuzz=%{_default_patch_fuzz} ")} \
+ %define __patch_options %{_default_patch_flags} %{-p:-p%{-p*}} %{-F:-F%{-F*}} %{-d:-d%{-d*}} %{-R} %{-E} %{__patch_suffix} \
+-echo "Patch #%{__patch_number} (%{basename:%{__patch_file}}):" && ( %{uncompress:%{__patch_file}} | %{__patch} %{__patch_fuzz}%{__patch_options} ) || exit 1\
++echo "Patch #%{__patch_number} (%{basename:%{__patch_file}}):" && [ -f %{__patch_file} ] && ( %{uncompress:%{__patch_file}} | %{__patch} %{__patch_fuzz}%{__patch_options} ) || exit 1\
+ }
+ 
+ #
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/46f50d304cb4c8e2a9fcd2328ab7f4ee189d14a8