- #%patch works, macro is %%{shrink:}'ed and 'missing %PATCHXXX' message

  was just misleading macro-expansion side-effect
- rel 0.19

diff --git a/rpm-remove-misleading-missing-patch-message.patch b/rpm-remove-misleading-missing-patch-message.patch
index d377a9c8ffb808b0f1e7a8a058461422a9fa14e8..a31ec78e89c29d5027afefb1122acd932bd12070 100644 (file)
--- a/rpm-remove-misleading-missing-patch-message.patch
+++ b/rpm-remove-misleading-missing-patch-message.patch
@@ -12,7 +12,7 @@
 +     * 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))
++    if ((strlen(file) > 6) && (strncasecmp(file, "%PATCH", 6) == 0))
 +      return 0;
 +#endif
  

diff --git a/rpm.spec b/rpm.spec
index 814980129252bf4c1aff8634125c0aadbb14a66f..851976dda474508ca2e4c6efc3401595fe591922 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,8 +2,6 @@
 # TODO:
 # - check if we want shell autodeps: Requires: executable(ln) executable(mv)
 # - 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
 #
 # - when adopting, use 4.5 ticket for checklist: https://bugs.launchpad.net/pld-linux/+bug/262985
 #
@@ -46,7 +44,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.10
-Release:       0.18
+Release:       0.19
 License:       LGPL
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm