rpms/rpm/devel .cvsignore, 1.29, 1.30 rpm.spec, 1.305, 1.306 sources, 1.135, 1.136 rpm-4.6.0-rc1-defaultdocdir.patch, 1.1, NONE rpm-4.6.0-rc1-file-debuginfo.patch, 1.1, NONE rpm-4.6.0-rc1-fp-hash.patch, 1.1, NONE rpm-4.6.0-rc1-noarch-subpkg.patch, 1.1, NONE rpm-4.6.0-rc1-permit-tab.patch, 1.1, NONE rpm-4.6.0-rc1-skip-equal-nevr.patch, 1.1, NONE

[Panu Matilainen]

Author: pmatilai

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

Modified Files:
	.cvsignore rpm.spec sources 
Removed Files:
	rpm-4.6.0-rc1-defaultdocdir.patch 
	rpm-4.6.0-rc1-file-debuginfo.patch rpm-4.6.0-rc1-fp-hash.patch 
	rpm-4.6.0-rc1-noarch-subpkg.patch 
	rpm-4.6.0-rc1-permit-tab.patch 
	rpm-4.6.0-rc1-skip-equal-nevr.patch 
Log Message:
- update to 4.6.0-rc2
- fixes #471820, #473167, #469355, #468319, #472507, #247374, #426672, #444661



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	16 Oct 2008 16:19:41 -0000	1.29
+++ .cvsignore	29 Nov 2008 16:45:45 -0000	1.30
@@ -1 +1 @@
-rpm-4.6.0-rc1.tar.bz2
+rpm-4.6.0-rc2.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- rpm.spec	31 Oct 2008 08:22:48 -0000	1.305
+++ rpm.spec	29 Nov 2008 16:45:45 -0000	1.306
@@ -10,7 +10,7 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.6.0
-%define snapver rc1
+%define snapver rc2
 %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}.7
+Release: 0.%{snapver}.1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -33,12 +33,6 @@
 Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
 
 # Patches already in upstream
-Patch200: rpm-4.6.0-rc1-permit-tab.patch
-Patch201: rpm-4.6.0-rc1-skip-equal-nevr.patch
-Patch202: rpm-4.6.0-rc1-noarch-subpkg.patch
-Patch203: rpm-4.6.0-rc1-defaultdocdir.patch
-Patch204: rpm-4.6.0-rc1-fp-hash.patch
-Patch205: rpm-4.6.0-rc1-file-debuginfo.patch
 
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
@@ -172,13 +166,6 @@
 %patch2 -p1 -b .gstreamer-prov
 %patch100 -p1 -b .pkgconfig-deps
 
-%patch200 -p1 -b .permit-tab
-%patch201 -p1 -b .skip-equal-nevr
-%patch202 -p1 -b .noarch-subpkg
-%patch203 -p1 -b .defaultdocdir
-%patch204 -p1 -b .fp-hash
-%patch205 -p1 -b .file-debuginfo
-
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
 
@@ -368,6 +355,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Sat Nov 29 2008 Panu Matilainen <pmatilai at redhat.com>
+- update to 4.6.0-rc2
+- fixes #471820, #473167, #469355, #468319, #472507, #247374, #426672, #444661
+
 * Fri Oct 31 2008 Panu Matilainen <pmatilai at redhat.com>
 - adjust find-debuginfo for "file" output change (#468129)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- sources	16 Oct 2008 16:19:41 -0000	1.135
+++ sources	29 Nov 2008 16:45:45 -0000	1.136
@@ -1 +1 @@
-083184a85aec253cb4c4662c46379925  rpm-4.6.0-rc1.tar.bz2
+9a8f0f5871fa7915d3443a8f82f1f60d  rpm-4.6.0-rc2.tar.bz2


--- rpm-4.6.0-rc1-defaultdocdir.patch DELETED ---


--- rpm-4.6.0-rc1-file-debuginfo.patch DELETED ---


--- rpm-4.6.0-rc1-fp-hash.patch DELETED ---


--- rpm-4.6.0-rc1-noarch-subpkg.patch DELETED ---


--- rpm-4.6.0-rc1-permit-tab.patch DELETED ---


--- rpm-4.6.0-rc1-skip-equal-nevr.patch DELETED ---