Fri Aug 1 14:44:24 UTC 2008

Author: jkeating

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10205/devel

Modified Files:
	.cvsignore rpm.spec sources 
Added Files:
	import.log rpm-4.5.90-posttrans.patch 
Removed Files:
	find-debuginfo.sh rpm-4.4.2-devel-autodep.patch 
	rpm-4.4.2-ghost-conflicts.patch rpm-4.4.2-matchpathcon.patch 
	rpm-4.4.2-rpmfc-skip.patch rpm-4.4.2-trust.patch 
	rpm-4.4.2.1-no-popt.patch rpm-4.4.2.2-autofoo.patch 
	rpm-4.4.2.2-devel-autodep.patch rpm-4.4.2.2-matchpathcon.patch 
	rpm-4.4.2.2-pkgconfig-path.patch 
	rpm-4.4.2.3-fix-find-requires.patch 
	rpm-4.4.2.3-geode-instplat.patch 
	rpm-4.4.2.3-no-order-rescan-limit.patch rpm-4.4.2.3-nss.patch 
	rpm-4.4.2.3-prereq.patch rpm-4.4.2.3-queryformat-arch.patch 
	rpm-4.4.2.3-rc1-sparc-mcpu.patch rpm-4.5.90-digestlen.patch 
	rpm-4.5.90-macroarg.patch rpm-4.5.90-mono-magic.patch 
	rpm-4.5.90-patchnum.patch 
Log Message:
New snapshot from upstream, fixes a number of bugs, important for f10 alpha



--- NEW FILE import.log ---
rpm-4_5_90-0_git8444_1:HEAD:rpm-4.5.90-0.git8444.1.src.rpm:1217601763

rpm-4.5.90-posttrans.patch:

--- NEW FILE rpm-4.5.90-posttrans.patch ---

diff --git a/lib/transaction.c b/lib/transaction.c
index 7e432a3..42f1b12 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -910,33 +910,51 @@ static int runTransScripts(rpmts ts, rpmTag stag)
 	if (script == NULL && scriptprog == NULL)
  	    continue;
 
-    	p->fd = rpmtsNotify(ts, p, RPMCALLBACK_INST_OPEN_FILE, 0, 0);
-    	p->h = NULL;
-    	if (rpmteFd(p) != NULL) {
-	    rpmVSFlags ovsflags = rpmtsVSFlags(ts);
-    	    rpmVSFlags vsflags = ovsflags | RPMVSF_NEEDPAYLOAD;
-	    rpmRC rpmrc;
-	    ovsflags = rpmtsSetVSFlags(ts, vsflags);
-	    rpmrc = rpmReadPackageFile(ts, rpmteFd(p),
-		    rpmteNEVR(p), &p->h);
-	    vsflags = rpmtsSetVSFlags(ts, ovsflags);
-	    switch (rpmrc) {
-	    default:
-	        /* FIX: notify annotations */
-	        p->fd = rpmtsNotify(ts, p, RPMCALLBACK_INST_CLOSE_FILE, 0, 0);
-	        p->fd = NULL;
-	        break;
-	    case RPMRC_NOTTRUSTED:
-	    case RPMRC_NOKEY:
-	    case RPMRC_OK:
-	        break;
+	if (stag==RPMTAG_POSTTRANS) {
+	    /* get (already installed) header from rpmdb */
+	    rpmdbMatchIterator mi;
+	    mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(p), 0);
+	    xx = rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP,
+				rpmteE(p));
+	    xx = rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP,
+				rpmteV(p));
+	    xx = rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_STRCMP,
+				rpmteR(p));
+	    xx = rpmdbSetIteratorRE(mi, RPMTAG_ARCH, RPMMIRE_STRCMP,
+				rpmteA(p));
+
+	    p->h = headerCopy(rpmdbNextIterator(mi));
+	    mi = rpmdbFreeIterator(mi);
+	} else {
+	    /* reread rpm file */
+	    p->fd = rpmtsNotify(ts, p, RPMCALLBACK_INST_OPEN_FILE, 0, 0);
+	    p->h = NULL;
+	    if (rpmteFd(p) != NULL) {
+		rpmVSFlags ovsflags = rpmtsVSFlags(ts);
+		rpmVSFlags vsflags = ovsflags | RPMVSF_NEEDPAYLOAD;
+		rpmRC rpmrc;
+		ovsflags = rpmtsSetVSFlags(ts, vsflags);
+		rpmrc = rpmReadPackageFile(ts, rpmteFd(p),
+					   rpmteNEVR(p), &p->h);
+		vsflags = rpmtsSetVSFlags(ts, ovsflags);
+		switch (rpmrc) {
+		default:
+		    /* FIX: notify annotations */
+		     p->fd = rpmtsNotify(ts, p, RPMCALLBACK_INST_CLOSE_FILE, 0, 0);
+		     p->fd = NULL;
+		     break;
+		case RPMRC_NOTTRUSTED:
+		case RPMRC_NOKEY:
+		case RPMRC_OK:
+		     break;
+		}
 	    }
-        }
+	}
 
-    	if (rpmteFd(p) != NULL) {
- 	    fi = rpmfiNew(ts, p->h, RPMTAG_BASENAMES, 1);
+	if (p->h) {
+	    fi = rpmfiNew(ts, p->h, RPMTAG_BASENAMES, 1);
 	    if (fi != NULL) {	/* XXX can't happen */
-		if (stag == RPMTAG_PRETRANS) {
+		if (stag == RPMTAG_PRETRANS) { /* isn't this the same? */
 		    fi->te = p;
 		    p->fi = fi;
 		} else {
@@ -944,14 +962,16 @@ static int runTransScripts(rpmts ts, rpmTag stag)
 		    p->fi->te = p;
 		}
 	    }
+	    fi->h = p->h; // is this right?
 	    psm = rpmpsmNew(ts, p, p->fi);
 	    assert(psm != NULL);
 	    xx = rpmpsmScriptStage(psm, stag, progtag);
 	    psm = rpmpsmFree(psm);
-
-	    (void) rpmtsNotify(ts, p, RPMCALLBACK_INST_CLOSE_FILE, 0, 0);
-	    p->fd = NULL;
-	    p->h = headerFree(p->h);
+	    if (p->fd != NULL) {
+		(void) rpmtsNotify(ts, p, RPMCALLBACK_INST_CLOSE_FILE, 0, 0);
+		p->fd = NULL;
+	    }
+	    p->h = fi->h = headerFree(p->h);
 	}
     }
     pi = rpmtsiFree(pi);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	11 Jul 2008 15:54:19 -0000	1.25
+++ .cvsignore	1 Aug 2008 14:43:54 -0000	1.26
@@ -1 +1 @@
-rpm-4.5.90.git8426.tar.bz2
+rpm-4.5.90.git8444.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- rpm.spec	19 Jul 2008 12:31:18 -0000	1.288
+++ rpm.spec	1 Aug 2008 14:43:54 -0000	1.289
@@ -10,7 +10,7 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.5.90
-%define snapver git8426
+%define snapver git8444
 %define srcver %{rpmver}.%{snapver}
 
 %define bdbver 4.5.20
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.9
+Release: 0.%{snapver}.1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -31,11 +31,8 @@
 # XXX only create provides for pkgconfig and libtool initially
 Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
 
-# These are already upstream, drop on next snapshot update:
-Patch200: rpm-4.5.90-digestlen.patch
-Patch201: rpm-4.5.90-mono-magic.patch
-Patch202: rpm-4.5.90-macroarg.patch
-Patch203: rpm-4.5.90-patchnum.patch
+# These are not yet upstream
+Patch200: rpm-4.5.90-posttrans.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
@@ -163,10 +160,7 @@
 %patch1 -p1 -b .pkgconfig-path
 %patch100 -p1 -b .pkgconfig-deps
 
-%patch200 -p1 -b .diglen
-%patch201 -p1 -b .mono-magic
-%patch202 -p1 -b .macroarg
-%patch203 -p1 -b .patchnum
+%patch200 -p1 -b .posttrans
 
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
@@ -342,6 +336,15 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Jul 31 2008 Florian Festi <ffesti at redhat.com>
+-  4.5.90-0.git8427.1
+- new snapshot from upstream
+
+* Thu Jul 31 2008 Florian Festi <ffesti at redhat.com>
+- 4.5.90-0.git8426.10
+- rpm-4.5.90-posttrans.patch
+- use header from rpmdb in posttrans to make anaconda happy
+
 * Sat Jul 19 2008 Panu Matilainen <pmatilai at redhat.com>
 - 4.5.90-0.git8426.9
 - fix regression in patch number handling (#455872)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- sources	11 Jul 2008 15:54:19 -0000	1.131
+++ sources	1 Aug 2008 14:43:54 -0000	1.132
@@ -1 +1 @@
-019294e156d2a3acefee118e38f65836  rpm-4.5.90.git8426.tar.bz2
+c753868c909cb711d1f06a9fedf092cc  rpm-4.5.90.git8444.tar.bz2


--- find-debuginfo.sh DELETED ---


--- rpm-4.4.2-devel-autodep.patch DELETED ---


--- rpm-4.4.2-ghost-conflicts.patch DELETED ---


--- rpm-4.4.2-matchpathcon.patch DELETED ---


--- rpm-4.4.2-rpmfc-skip.patch DELETED ---


--- rpm-4.4.2-trust.patch DELETED ---


--- rpm-4.4.2.1-no-popt.patch DELETED ---


--- rpm-4.4.2.2-autofoo.patch DELETED ---


--- rpm-4.4.2.2-devel-autodep.patch DELETED ---


--- rpm-4.4.2.2-matchpathcon.patch DELETED ---


--- rpm-4.4.2.2-pkgconfig-path.patch DELETED ---


--- rpm-4.4.2.3-fix-find-requires.patch DELETED ---


--- rpm-4.4.2.3-geode-instplat.patch DELETED ---


--- rpm-4.4.2.3-no-order-rescan-limit.patch DELETED ---


--- rpm-4.4.2.3-nss.patch DELETED ---


--- rpm-4.4.2.3-prereq.patch DELETED ---


--- rpm-4.4.2.3-queryformat-arch.patch DELETED ---


--- rpm-4.4.2.3-rc1-sparc-mcpu.patch DELETED ---


--- rpm-4.5.90-digestlen.patch DELETED ---


--- rpm-4.5.90-macroarg.patch DELETED ---


--- rpm-4.5.90-mono-magic.patch DELETED ---


--- rpm-4.5.90-patchnum.patch DELETED ---


