rpms/rpm/devel .cvsignore, 1.34, 1.35 rpm.spec, 1.343, 1.344 sources, 1.140, 1.141

[Panu Matilainen]

Author: pmatilai

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

Modified Files:
	.cvsignore rpm.spec sources 
Log Message:
- update to 4.7.0-rc1
- fixes #493157, #493777, #493696, #491388, #487597, #493162



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	6 Mar 2009 18:28:20 -0000	1.34
+++ .cvsignore	9 Apr 2009 12:46:15 -0000	1.35
@@ -1 +1 @@
-rpm-4.7.0-beta1.tar.bz2
+rpm-4.7.0-rc1.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- rpm.spec	3 Apr 2009 07:45:24 -0000	1.343
+++ rpm.spec	9 Apr 2009 12:46:15 -0000	1.344
@@ -16,7 +16,7 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.7.0
-%define snapver beta1
+%define snapver rc1
 %define srcver %{rpmver}-%{snapver}
 
 %define bdbver 4.7.25
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.9%{?dist}
+Release: 0.%{snapver}.1%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -43,17 +43,10 @@
 Patch3: rpm-4.6.0-fedora-specspo.patch
 
 # Patches already in upstream
-Patch200: rpm-4.7.0-beta1-srcrpm-macros.patch
-Patch201: rpm-4.7.0-beta1-fstates.patch
-Patch202: rpm-4.7.0-beta1-installangs.patch
-Patch203: rpm-4.7.0-alpha-isa.patch
-Patch204: rpm-4.7.0-rsa-v4.patch
-Patch205: rpm-4.7.0-beta1-default-filestate.patch
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
-Patch301: rpm-4.7.0-rpmfc-order.patch
-Patch302: rpm-4.6.0-niagara.patch
+Patch301: rpm-4.6.0-niagara.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
@@ -191,16 +184,8 @@
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .fedora-specspo
 
-%patch200 -p1 -b .srcrpm-macros
-%patch201 -p1 -b .fstates
-%patch202 -p1 -b .installangs
-%patch203 -p1 -b .alpha-isa
-%patch204 -p1 -b .rsa-v4
-%patch205 -p1 -b .default-fstate
-
 %patch300 -p1 -b .extra-prov
-%patch301 -p1 -b .rpmfc-order
-%patch302 -p1 -b .niagara
+%patch301 -p1 -b .niagara
 
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
@@ -409,6 +394,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Apr 09 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.rc1.1
+- update to 4.7.0-rc1
+- fixes #493157, #493777, #493696, #491388, #487597, #493162
+
 * Fri Apr 03 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.9
 - fix recorded file state of otherwise skipped files (#492947)
 - compress ChangeLog, drop old CHANGES file (#492440)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- sources	6 Mar 2009 18:28:21 -0000	1.140
+++ sources	9 Apr 2009 12:46:16 -0000	1.141
@@ -1 +1 @@
-ea6cf6444b401ed19f4756a1bc279884  rpm-4.7.0-beta1.tar.bz2
+321862428ef48d9d0bc36f7058b3b6c7  rpm-4.7.0-rc1.tar.bz2