rpms/rpm/devel rpm-4.5.90-patches.patch, NONE, 1.1 rpm.spec, 1.293, 1.294

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18808

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.5.90-patches.patch 
Log Message:
* Sat Sep 06 2008 Jindrich Novy <jnovy at redhat.com>
- fail hard if patch isn't found (#461347)


rpm-4.5.90-patches.patch:

--- NEW FILE rpm-4.5.90-patches.patch ---
commit ce1db5af7036df54a21abab9a5d70b06a821fff4
Author: Jindrich Novy <jnovy at 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;
 	}
     }


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- rpm.spec	1 Sep 2008 14:38:38 -0000	1.293
+++ rpm.spec	6 Sep 2008 13:36:14 -0000	1.294
@@ -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 @@
 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 @@
 %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 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Sat Sep 06 2008 Jindrich Novy <jnovy at redhat.com>
+- fail hard if patch isn't found (#461347)
+
 * Mon Sep 01 2008 Jindrich Novy <jnovy at redhat.com>
 - fix parsing of boolean expressions in spec (#456103)
   (unbreaks pam, jpilot and maybe other builds)