From 2b2e2bf0cb31e19bb301cd0138b97ee1897adcef Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Sep 06 2008 13:36:14 +0000
Subject: - fail hard if patch isn't found (#461347)


---

diff --git a/rpm-4.5.90-patches.patch b/rpm-4.5.90-patches.patch
new file mode 100644
index 0000000..303865d
--- /dev/null
+++ b/rpm-4.5.90-patches.patch
@@ -0,0 +1,19 @@
+commit ce1db5af7036df54a21abab9a5d70b06a821fff4
+Author: Jindrich Novy <jnovy@redhat.com>
+Date:   Sat Sep 6 15:30:40 2008 +0200
+
+    Fail hard if patch isn't found (rhbz#461347)
+
+diff --git a/build/parsePrep.c b/build/parsePrep.c
+index fcc28c8..2be0693 100644
+--- a/build/parsePrep.c
++++ b/build/parsePrep.c
+@@ -538,7 +538,7 @@ int parsePrep(rpmSpec spec)
+ 	}
+ 	if (res && !spec->force) {
+ 	    /* fixup from RPMRC_FAIL do*Macro() codes for now */
+-	    res = PART_ERROR; 
++	    nextPart = PART_ERROR; 
+ 	    goto exit;
+ 	}
+     }
diff --git a/rpm.spec b/rpm.spec
index 093b430..af40ddb 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.4
+Release: 0.%{snapver}.5
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -36,6 +36,7 @@ Patch200: rpm-4.5.90-archivesize.patch
 Patch201: rpm-4.5.90-noarch-subpackages.patch
 Patch202: rpm-4.5.90-segfault.patch
 Patch203: rpm-4.5.90-macrofix.patch
+Patch204: rpm-4.5.90-patches.patch
 
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
@@ -170,6 +171,7 @@ that will manipulate RPM packages and databases.
 %patch201 -p1 -b .noarch-subpackages
 %patch202 -p1 -b .segfault
 %patch203 -p1 -b .macrofix
+%patch204 -p1 -b .patches
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -348,6 +350,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Sat Sep 06 2008 Jindrich Novy <jnovy@redhat.com>
+- fail hard if patch isn't found (#461347)
+
 * Mon Sep 01 2008 Jindrich Novy <jnovy@redhat.com>
 - fix parsing of boolean expressions in spec (#456103)
   (unbreaks pam, jpilot and maybe other builds)