[packages/rpm] - attempt to fix TODO item http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/5d3a

[baggins]

commit 78af24ac87dd473724c8abab432342613a7febb6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 17 18:12:29 2012 +0200

    - attempt to fix TODO item
      http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/5d3a3ea257d7f88e59d0ad93c20cc8448fb42f3d

 rpm-remove-misleading-missing-patch-message.patch | 20 ++++++++++++++++++++
 rpm.spec                                          |  2 ++
 2 files changed, 22 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index b31b021..8149801 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -127,6 +127,7 @@ 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
+Patch48:	%{name}-remove-misleading-missing-patch-message.patch
 
 # Patches imported from Mandriva
 
@@ -795,6 +796,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch45 -p1
 %patch46 -p1
 %patch47 -p1
+%patch48 -p1
 
 %patch1000 -p1
 %patch1001 -p1
diff --git a/rpm-remove-misleading-missing-patch-message.patch b/rpm-remove-misleading-missing-patch-message.patch
new file mode 100644
index 0000000..d377a9c
--- /dev/null
+++ b/rpm-remove-misleading-missing-patch-message.patch
@@ -0,0 +1,20 @@
+--- rpm-5.4.10/rpmio/macro.c~	2012-09-17 14:07:24.201198493 +0200
++++ rpm-5.4.10/rpmio/macro.c	2012-09-17 18:10:28.221354435 +0200
+@@ -3054,6 +3054,17 @@
+ #endif
+ 
+     *compressed = COMPRESSED_NOT;
++#if defined(RPM_VENDOR_PLD)
++    /*
++     * Workaround for misleading message:
++     * error: File %PATCH666: No such file or directory
++     * It happens when there is no "PatchXXX: " definition
++     * and spec contains commented out %patchXXX macro
++     * http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/5d3a3ea257d7f88e59d0ad93c20cc8448fb42f3d
++     */
++    if (strlen(file) > 6 && strncasecmp(file, "%PATCH", 6))
++	return 0;
++#endif
+ 
+ #if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_FEDORA) || defined(RPM_VENDOR_MANDRIVA) /* extension-based-compression-detection */
+     file_len = strlen(file);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/78af24ac87dd473724c8abab432342613a7febb6