rpms/rpm/devel .cvsignore, 1.39, 1.40 rpm.spec, 1.376, 1.377 sources, 1.145, 1.146 rpm-4.7.90-python-bytecompile.patch, 1.1, NONE rpm-4.7.90-python-refcounts.patch, 1.1, NONE rpm-4.7.90-spec-allow-unexpanded-macros.patch, 1.1, NONE

[Panu Matilainen]

Author: pmatilai

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

Modified Files:
	.cvsignore rpm.spec sources 
Removed Files:
	rpm-4.7.90-python-bytecompile.patch 
	rpm-4.7.90-python-refcounts.patch 
	rpm-4.7.90-spec-allow-unexpanded-macros.patch 
Log Message:
- update to 4.8.0 final



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	7 Dec 2009 13:35:11 -0000	1.39
+++ .cvsignore	8 Jan 2010 09:42:33 -0000	1.40
@@ -1 +1 @@
-rpm-4.8.0-beta1.tar.bz2
+rpm-4.8.0.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -p -r1.376 -r1.377
--- rpm.spec	7 Jan 2010 09:27:49 -0000	1.376
+++ rpm.spec	8 Jan 2010 09:42:34 -0000	1.377
@@ -12,8 +12,8 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.8.0
-%define snapver beta1
-%define srcver %{rpmver}-%{snapver}
+%define snapver %{nil}
+%define srcver %{rpmver}
 
 %define bdbver 4.8.24
 %define dbprefix db
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.6
+Release: 1
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -37,9 +37,6 @@ Patch2: rpm-4.5.90-gstreamer-provides.pa
 Patch3: rpm-4.7.90-fedora-specspo.patch
 
 # Patches already in upstream
-Patch200: rpm-4.7.90-python-bytecompile.patch
-Patch201: rpm-4.7.90-python-refcounts.patch
-Patch202: rpm-4.7.90-spec-allow-unexpanded-macros.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -184,10 +181,6 @@ packages on a system.
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .fedora-specspo
 
-%patch200 -p1 -b .python-bytecompile
-%patch201 -p1 -b .python-refcounts
-%patch202 -p1 -b .spec-unexpanded-macros
-
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
 
@@ -401,6 +394,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Jan 08 2010 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-1
+- update to 4.8.0 final (http://rpm.org/wiki/Releases/4.8.0)
+
 * Thu Jan 07 2010 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-0.beta1.6
 - pull out macro scoping "fix" for now, it breaks font package macros
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- sources	7 Dec 2009 13:35:12 -0000	1.145
+++ sources	8 Jan 2010 09:42:34 -0000	1.146
@@ -1 +1 @@
-dfe8f6b28d85b85b66ddacf712904fc1  rpm-4.8.0-beta1.tar.bz2
+04b586910243cb2475ac16becd862731  rpm-4.8.0.tar.bz2


--- rpm-4.7.90-python-bytecompile.patch DELETED ---


--- rpm-4.7.90-python-refcounts.patch DELETED ---


--- rpm-4.7.90-spec-allow-unexpanded-macros.patch DELETED ---