- merged 4.1 patches... hope I didn't brake anything

[packages/rpm.git] / rpm-choke-on-evil-doc.patch

diff --git a/rpm-choke-on-evil-doc.patch b/rpm-choke-on-evil-doc.patch
index 812c7e30e9cc3ef748e697be0da7486428a7cd6e..2b881d9b139e861b89e1e6f49a2ee3d5f080594f 100644 (file)
--- a/rpm-choke-on-evil-doc.patch
+++ b/rpm-choke-on-evil-doc.patch
@@ -1,13 +1,16 @@
---- rpm-4.0.2/build/files.c.orig       Thu Jul 25 15:57:52 2002
-+++ rpm-4.0.2/build/files.c    Thu Jul 25 16:40:55 2002
-@@ -1548,7 +1548,9 @@
+diff -ur rpm-4.0.4/build/files.c rpm-4.0.4-/build/files.c
+--- rpm-4.0.4/build/files.c    Tue Jul 23 10:38:11 2002
++++ rpm-4.0.4-/build/files.c   Tue Jul 23 10:37:57 2002
+@@ -1943,7 +1943,10 @@
      /* Now process special doc, if there is one */
      if (specialDoc) {
        if (installSpecialDoc) {
--          doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test);
-+          int rc = doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test);
+-          (void) doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test);
++          int rc = doScript(spec, RPMBUILD_STRINGBUF, "%doc", 
++                            pkg->specialDoc, test);
 +          if (rc)
 +              fl.processingFailed = rc;
        }
  
        /* Reset for %doc */
+Only in rpm-4.0.4-/build: tags