rpms/rpm/devel rpm-4.6.0-anyarch-actions-fix.patch, 1.1, 1.2 rpm.spec, 1.327, 1.328

[Jindrich Novy]

Author: jnovy

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

Modified Files:
	rpm-4.6.0-anyarch-actions-fix.patch rpm.spec 
Log Message:
* Tue Feb 17 2009 Jindrich Novy <jnovy at redhat.com> - 4.6.0-5
- remove two offending hunks from anyarch patch causing that
  RPMTAG_BUILDARCHS isn't written to SRPMs


rpm-4.6.0-anyarch-actions-fix.patch:

Index: rpm-4.6.0-anyarch-actions-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm-4.6.0-anyarch-actions-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.6.0-anyarch-actions-fix.patch	16 Feb 2009 17:31:31 -0000	1.1
+++ rpm-4.6.0-anyarch-actions-fix.patch	17 Feb 2009 07:39:46 -0000	1.2
@@ -69,37 +69,6 @@
      /* Assemble source header from parsed components */
      initSourceHeader(spec);
  
-diff -up rpm-4.6.0/build/parsePreamble.c.anyarch-actions-fix rpm-4.6.0/build/parsePreamble.c
---- rpm-4.6.0/build/parsePreamble.c.anyarch-actions-fix	2009-02-16 13:19:43.000000000 +0100
-+++ rpm-4.6.0/build/parsePreamble.c	2009-02-16 13:19:43.000000000 +0100
-@@ -859,8 +859,14 @@ int parsePreamble(rpmSpec spec, int init
- 		    goto exit;
- 		}
- 		if (spec->BANames && !spec->recursing) {
--		    res = PART_BUILDARCHITECTURES;
--		    goto exit;
-+		    /* Ignore BuildArch tags for anyarch actions */
-+		    if (spec->anyarch) {
-+			spec->BANames = _free(spec->BANames);
-+			spec->BACount = 0;
-+		    } else {
-+			res = PART_BUILDARCHITECTURES;
-+			goto exit;
-+		    }
- 		}
- 	    }
- 	    if ((rc =
-@@ -895,8 +901,8 @@ int parsePreamble(rpmSpec spec, int init
- 	addMacro(spec->macros, "buildroot", NULL, spec->buildRoot, RMIL_SPEC);
-     }
- 
--    /* XXX Skip valid arch check if not building binary package */
--    if (!spec->anyarch && checkForValidArchitectures(spec)) {
-+    /* This check is harmless as BuildArch tags are ignored in case of anyarch != 0 */
-+    if (checkForValidArchitectures(spec)) {
- 	goto exit;
-     }
- 
 diff -up rpm-4.6.0/build/rpmbuild.h.anyarch-actions-fix rpm-4.6.0/build/rpmbuild.h
 --- rpm-4.6.0/build/rpmbuild.h.anyarch-actions-fix	2008-12-05 12:49:22.000000000 +0100
 +++ rpm-4.6.0/build/rpmbuild.h	2009-02-16 13:19:43.000000000 +0100


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- rpm.spec	16 Feb 2009 17:31:31 -0000	1.327
+++ rpm.spec	17 Feb 2009 07:39:46 -0000	1.328
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -377,6 +377,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Feb 17 2009 Jindrich Novy <jnovy at redhat.com> - 4.6.0-5
+- remove two offending hunks from anyarch patch causing that
+  RPMTAG_BUILDARCHS isn't written to SRPMs
+
 * Mon Feb 16 2009 Jindrich Novy <jnovy at redhat.com> - 4.6.0-4
 - inherit group tag from the main package (#470714)
 - ignore BuildArch tags for anyarch actions (#442105)