rpms/rpm/F-10 rpm.spec,1.312,1.313

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/rpm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8889/F-10

Modified Files:
	rpm.spec 
Log Message:
niagara patch


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-10/rpm.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- rpm.spec	2 Apr 2009 17:25:50 -0000	1.312
+++ rpm.spec	2 Apr 2009 17:41:14 -0000	1.313
@@ -17,7 +17,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -32,9 +32,6 @@
 # this as Fedora-specific patch for now
 Patch3: rpm-4.6.0-fedora-specspo.patch
 
-# Fix sparcv9v and sparc64v targets
-Patch4: rpm-4.6.0-niagara.patch
-
 # XXX only create provides for pkgconfig and libtool initially
 Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
 
@@ -45,6 +42,9 @@
 Patch203: rpm-4.6.0-alpha-isa.patch
 Patch204: rpm-4.6.0-rsa-v4.patch
 
+# Patches not yet upstream
+Patch300: rpm-4.6.0-niagara.patch
+
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
 License: GPLv2+
@@ -182,6 +182,8 @@
 %patch203 -p1 -b .alpha-isa
 %patch204 -p1 -b .rsa-v4
 
+%patch300 -p1 -b .niagara
+
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
 %endif
@@ -377,6 +379,9 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.6.0-4
+- actually apply niagara patch
+
 * Thu Apr  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.6.0-3
 - Fix sparcv9v and sparc64v targets