Wed Oct 1 08:43:35 UTC 2008

Author: pmatilai

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

Modified Files:
	.cvsignore rpm.spec sources 
Added Files:
	rpm-4.5.90-ppc-isa.patch 
Removed Files:
	rpm-4.5.90-archivesize.patch rpm-4.5.90-cpio-hardlink.patch 
	rpm-4.5.90-macro-args.patch rpm-4.5.90-macrofix.patch 
	rpm-4.5.90-noarch-subpackages.patch rpm-4.5.90-patch-P.patch 
	rpm-4.5.90-patches.patch rpm-4.5.90-rpmbuild-dirs.patch 
	rpm-4.5.90-segfault.patch rpm-4.5.90-topdir.patch 
Log Message:
- update to official 4.5.90 alpha tarball
- a big pile of misc bugfixes + translation updates
- isa-macro generation fix for ppc (#464754)
- avoid pulling in pile of perl dependencies for an unused script
- handle both "invalid argument" and clear env version mismatch on posttrans


rpm-4.5.90-ppc-isa.patch:

--- NEW FILE rpm-4.5.90-ppc-isa.patch ---
commit 65e06b20130da895fda8e3698a7ebe18e14d13ca
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Oct 1 10:06:27 2008 +0300

    Tweaks to how ISA-macros are generated (rhbz#464754)
    - for ppc and sparc, move the check for 64bit version first and use a
      wildcards to cover more field automatically

diff --git a/installplatform b/installplatform
index bb5933d..8861df0 100755
--- a/installplatform
+++ b/installplatform
@@ -80,13 +80,13 @@ for SUBST in $SUBSTS ; do
   ISANAME=
   ISABITS=
   case "${ARCH}" in
-    sparc|sparcv8|sparcv9*) 
+    sparc64*) 
 	ISANAME=sparc
-	ISABITS=32
+	ISABITS=64
 	;;
-    sparc64|sparc64v) 
+    sparc*) 
 	ISANAME=sparc
-	ISABITS=64
+	ISABITS=32
 	;;
     s390)
 	ISANAME=s390
@@ -96,13 +96,13 @@ for SUBST in $SUBSTS ; do
 	ISANAME=s390
 	ISABITS=64
 	;;
-    ppc)
+    ppc64*)
 	ISANAME=ppc
-	ISABITS=32
+	ISABITS=64
 	;;
-    ppc64)
+    ppc*)
 	ISANAME=ppc
-	ISABITS=64
+	ISABITS=32
 	;;
     i?86|pentium?|athlon|geode)
 	ISANAME=x86


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	8 Aug 2008 11:53:00 -0000	1.27
+++ .cvsignore	1 Oct 2008 08:43:03 -0000	1.28
@@ -1 +1 @@
-rpm-4.5.90.git8461.tar.bz2
+rpm-4.5.90.git8514.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- rpm.spec	25 Sep 2008 17:06:00 -0000	1.297
+++ rpm.spec	1 Oct 2008 08:43:03 -0000	1.298
@@ -10,7 +10,7 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.5.90
-%define snapver git8461
+%define snapver git8514
 %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}.8
+Release: 0.%{snapver}.1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -33,16 +33,7 @@
 Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
 
 # Already in upstream, remove on next snapshot update
-Patch200: rpm-4.5.90-archivesize.patch
-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
-Patch205: rpm-4.5.90-topdir.patch
-Patch206: rpm-4.5.90-rpmbuild-dirs.patch
-Patch207: rpm-4.5.90-cpio-hardlink.patch
-Patch208: rpm-4.5.90-macro-args.patch
-Patch209: rpm-4.5.90-patch-P.patch
+Patch200: rpm-4.5.90-ppc-isa.patch
 
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
@@ -174,16 +165,7 @@
 %patch2 -p1 -b .gstreamer-prov
 %patch100 -p1 -b .pkgconfig-deps
 
-%patch200 -p1 -b .archivesize
-%patch201 -p1 -b .noarch-subpackages
-%patch202 -p1 -b .segfault
-%patch203 -p1 -b .macrofix
-%patch204 -p1 -b .patches
-%patch205 -p1 -b .topdir
-%patch206 -p1 -b .rpmbuild-dirs
-%patch207 -p1 -b .cpio-hardlink
-%patch208 -p1 -b .macro-args
-%patch209 -p1 -b .patch-P
+%patch200 -p1 -b .ppc-isa
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -194,9 +176,11 @@
 
 %build
 %if %{without int_bdb}
-export CPPFLAGS=-I%{_includedir}/db%{bdbver} 
-export LDFLAGS=-L%{_libdir}/db%{bdbver}
+CPPFLAGS=-I%{_includedir}/db%{bdbver} 
+LDFLAGS=-L%{_libdir}/db%{bdbver}
 %endif
+CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
+export CPPFLAGS LDFLAGS
 
 %configure \
     %{!?with_int_bdb: --with-external-db} \
@@ -236,6 +220,9 @@
 
 find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f
 
+# avoid dragging in tonne of perl libs for an unused script
+chmod 0644 $RPM_BUILD_ROOT/%{rpmhome}/perldeps.pl
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -250,7 +237,7 @@
 dbstat=%{_bindir}/db45_stat
 %endif
 if [ -x "$dbstat" ]; then
-    if "$dbstat" -e -h /var/lib/rpm 2>&1 | grep -q "Invalid argument"; then
+    if "$dbstat" -e -h /var/lib/rpm 2>&1 | grep -q "doesn't match environment version \| Invalid argument"; then
         rm -f /var/lib/rpm/__db.* 
     fi
 fi
@@ -362,6 +349,13 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Wed Oct 01 2008 Panu Matilainen <pmatilai at redhat.com>
+- update to official 4.5.90 alpha tarball 
+- a big pile of misc bugfixes + translation updates
+- isa-macro generation fix for ppc (#464754)
+- avoid pulling in pile of perl dependencies for an unused script
+- handle both "invalid argument" and clear env version mismatch on posttrans
+
 * Thu Sep 25 2008 Jindrich Novy <jnovy at redhat.com>
 - don't treat %patch numberless if -P parameter is present (#463942)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- sources	8 Aug 2008 11:53:00 -0000	1.133
+++ sources	1 Oct 2008 08:43:03 -0000	1.134
@@ -1 +1 @@
-d1521d8974b4d7f091fb950005de3c03  rpm-4.5.90.git8461.tar.bz2
+5bb759ffc690dfc9e1456391fa001447  rpm-4.5.90.git8514.tar.bz2


--- rpm-4.5.90-archivesize.patch DELETED ---


--- rpm-4.5.90-cpio-hardlink.patch DELETED ---


--- rpm-4.5.90-macro-args.patch DELETED ---


--- rpm-4.5.90-macrofix.patch DELETED ---


--- rpm-4.5.90-noarch-subpackages.patch DELETED ---


--- rpm-4.5.90-patch-P.patch DELETED ---


--- rpm-4.5.90-patches.patch DELETED ---


--- rpm-4.5.90-rpmbuild-dirs.patch DELETED ---


--- rpm-4.5.90-segfault.patch DELETED ---


--- rpm-4.5.90-topdir.patch DELETED ---


