rpms/rpm/devel rpm-4.5.90-archivesize.patch, NONE, 1.1 rpm.spec, 1.290, 1.291

[Panu Matilainen (pmatilai)]

Author: pmatilai

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

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.5.90-archivesize.patch 
Log Message:
- fix archivesize tag generation on ppc (#458817)


rpm-4.5.90-archivesize.patch:

--- NEW FILE rpm-4.5.90-archivesize.patch ---
commit 9068da47a912a6983a12d1024a118c16bcb2a057
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Aug 13 09:43:41 2008 +0300

    Unbreak payload size tag generation on ppc (rhbz#458817)

diff --git a/build/pack.c b/build/pack.c
index 41756bb..9891ae8 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -496,13 +496,16 @@ rpmRC writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName,
 	td.tag = payloadtag;
 	td.count = 1;
 	if (payloadtag == RPMSIGTAG_PAYLOADSIZE) {
+	    rpm_off_t asize = csa->cpioArchiveSize;
 	    td.type = RPM_INT32_TYPE;
-	    td.data = (rpm_off_t *) &csa->cpioArchiveSize;
+	    td.data = &asize;
+	    headerPut(sig, &td, HEADERPUT_DEFAULT);
 	} else {
+	    rpm_loff_t asize = csa->cpioArchiveSize;
 	    td.type = RPM_INT64_TYPE;
-	    td.data = (rpm_loff_t *) &csa->cpioArchiveSize;
+	    td.data = &asize;
+	    headerPut(sig, &td, HEADERPUT_DEFAULT);
 	}
-	headerPut(sig, &td, HEADERPUT_DEFAULT);
     }
 
     /* Reallocate the signature into one contiguous region. */


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- rpm.spec	8 Aug 2008 11:53:00 -0000	1.290
+++ rpm.spec	13 Aug 2008 06:56:06 -0000	1.291
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.1
+Release: 0.%{snapver}.2
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -31,8 +31,11 @@
 # XXX only create provides for pkgconfig and libtool initially
 Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
 
+# Already in upstream, remove on next snapshot update
+Patch200: rpm-4.5.90-archivesize.patch
+
 # These are not yet upstream
-Patch200: rpm-4.5.90-posttrans.patch
+Patch300: rpm-4.5.90-posttrans.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
@@ -160,8 +163,10 @@
 %patch1 -p1 -b .pkgconfig-path
 %patch100 -p1 -b .pkgconfig-deps
 
+%patch200 -p1 -b .archivesize
+
 # needs a bit of upstream love first...
-#%patch200 -p1 -b .posttrans
+#%patch300 -p1 -b .posttrans
 
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
@@ -337,6 +342,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Wed Aug 13 2008 Panu Matilainen <pmatilai at redhat.com>
+- 4.5.90-0.git8461.2
+- fix archivesize tag generation on ppc (#458817)
+
 * Fri Aug 08 2008 Panu Matilainen <pmatilai at redhat.com>
 - 4.5.90-0.git8461.1
 - new snapshot from upstream