rpms/rpm/devel .cvsignore, 1.30, 1.31 rpm.spec, 1.314, 1.315 sources, 1.136, 1.137 rpm-4.5.90-rpmfileutil.patch, 1.1, NONE rpm-4.6.0-rc2-pkgconfig-provides.patch, 1.1, NONE

[Panu Matilainen]

Author: pmatilai

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

Modified Files:
	.cvsignore rpm.spec sources 
Removed Files:
	rpm-4.5.90-rpmfileutil.patch 
	rpm-4.6.0-rc2-pkgconfig-provides.patch 
Log Message:
- update to rpm 4.6.0-rc3
- fixes #475214, #474550, #473239



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	29 Nov 2008 16:45:45 -0000	1.30
+++ .cvsignore	9 Dec 2008 13:28:07 -0000	1.31
@@ -1 +1 @@
-rpm-4.6.0-rc2.tar.bz2
+rpm-4.6.0-rc3.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- rpm.spec	3 Dec 2008 21:22:36 -0000	1.314
+++ rpm.spec	9 Dec 2008 13:28:08 -0000	1.315
@@ -10,7 +10,7 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.6.0
-%define snapver rc2
+%define snapver rc3
 %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
@@ -29,8 +29,6 @@
 Patch0: rpm-4.5.90-devel-autodep.patch
 Patch1: rpm-4.5.90-pkgconfig-path.patch
 Patch2: rpm-4.5.90-gstreamer-provides.patch
-Patch3: rpm-4.5.90-rpmfileutil.patch
-Patch4: rpm-4.6.0-rc2-pkgconfig-provides.patch
 
 # Patches already in upstream
 
@@ -165,8 +163,6 @@
 %patch0 -p1 -b .devel-autodep
 %patch1 -p1 -b .pkgconfig-path
 %patch2 -p1 -b .gstreamer-prov
-%patch3 -p1 -b .rpmfileutil
-%patch4 -p1 -b .pkgconfig-provides
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -357,6 +353,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Dec 09 2008 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-0.rc3.1
+- update to rpm 4.6.0-rc3
+- fixes #475214, #474550, #473239
+
 * Wed Dec  3 2008 Jeremy Katz <katzj at redhat.com> - 4.6.0-0.rc2.9
 - I built into the wrong place
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- sources	29 Nov 2008 16:45:45 -0000	1.136
+++ sources	9 Dec 2008 13:28:08 -0000	1.137
@@ -1 +1 @@
-9a8f0f5871fa7915d3443a8f82f1f60d  rpm-4.6.0-rc2.tar.bz2
+8f4f5f8a05fa4f4dfe34119d1059d3ce  rpm-4.6.0-rc3.tar.bz2


--- rpm-4.5.90-rpmfileutil.patch DELETED ---


--- rpm-4.6.0-rc2-pkgconfig-provides.patch DELETED ---