rpms/rpm/devel rpm-4.7.0-beta1-srcrpm-macros.patch, NONE, 1.1 rpm.spec, 1.335, 1.336

[Panu Matilainen]

Author: pmatilai

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

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.0-beta1-srcrpm-macros.patch 
Log Message:
- load macros before creating directories on src.rpm install (#489104)


rpm-4.7.0-beta1-srcrpm-macros.patch:

--- NEW FILE rpm-4.7.0-beta1-srcrpm-macros.patch ---
commit 7a813e149fe40bbb9beee7dbf9898ab0c1906da2
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Sun Mar 8 11:33:22 2009 +0200

    Load macros before creating directories (rhbz#489104)
    - %_sourcedir and friends can have things like %{name}, load macros
      before trying to create any directories when installing src.rpms
    (cherry picked from commit ac7c3412278a03da6633758bca999827d4b59038)

diff --git a/lib/psm.c b/lib/psm.c
index 3b2fd7c..112d344 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -275,6 +275,9 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd,
     if (rootdir && strcmp(rootdir, "/") == 0)
 	rootdir = NULL;
 
+    /* Macros need to be added before trying to create directories */
+    rpmInstallLoadMacros(h);
+
     if (specix >= 0) {
 	const char *bn;
 
@@ -301,8 +304,6 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd,
 	goto exit;
     }
 
-    rpmInstallLoadMacros(h);
-
     te = rpmtsElement(ts, 0);
     if (te == NULL) {	/* XXX can't happen */
 	goto exit;


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- rpm.spec	6 Mar 2009 18:28:20 -0000	1.335
+++ rpm.spec	8 Mar 2009 09:52:55 -0000	1.336
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.1%{?dist}
+Release: 0.%{snapver}.2%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -43,6 +43,7 @@
 Patch3: rpm-4.6.0-fedora-specspo.patch
 
 # Patches already in upstream
+Patch200: rpm-4.7.0-beta1-srcrpm-macros.patch
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
@@ -183,6 +184,8 @@
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .fedora-specspo
 
+%patch200 -p1 -b .srcrpm-macros
+
 %patch300 -p1 -b .extra-prov
 
 %if %{with int_bdb}
@@ -388,6 +391,9 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Sun Mar 08 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.2
+- load macros before creating directories on src.rpm install (#489104)
+
 * Fri Mar 06 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.1
 - update to 4.7.0-beta1 (http://rpm.org/wiki/Releases/4.7.0)