From 5957a8552c188b8572f2098e6d05521243cdecbf Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@fedoraproject.org>
Date: Thu, 16 Apr 2009 09:24:08 +0000
Subject: [PATCH] - update to 4.7.0 final - fixes #494049, #495429 - dont
 permit test-suite failure anymore

---
 .cvsignore |  2 +-
 rpm.spec   | 14 +++++++++-----
 sources    |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 95ebf52..3eb00bc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rpm-4.7.0-rc1.tar.bz2
+rpm-4.7.0.tar.bz2
diff --git a/rpm.spec b/rpm.spec
index f05af58..19cc45a 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -16,8 +16,8 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.7.0
-%define snapver rc1
-%define srcver %{rpmver}-%{snapver}
+%define snapver {nil}
+%define srcver %{rpmver}
 
 %define bdbver 4.7.25
 %define dbprefix db
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.1%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -269,8 +269,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with check}
 %check
-# missing file in beta1 tarball causes two failures, permit failure for now
-make check ||:
+make check
 %endif
 
 %post libs -p /sbin/ldconfig
@@ -394,6 +393,11 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Apr 16 2009 Panu Matilainen <pmatilai@redhat.com> - 4.7.0-1
+- update to 4.7.0 final (http://rpm.org/wiki/Releases/4.7.0)
+- fixes #494049, #495429
+- dont permit test-suite failure anymore
+
 * Thu Apr 09 2009 Panu Matilainen <pmatilai@redhat.com> - 4.7.0-0.rc1.1
 - update to 4.7.0-rc1
 - fixes #493157, #493777, #493696, #491388, #487597, #493162
diff --git a/sources b/sources
index 634684e..9ee2abb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-321862428ef48d9d0bc36f7058b3b6c7  rpm-4.7.0-rc1.tar.bz2
+74791d638c571ec79f06227d453a6a03  rpm-4.7.0.tar.bz2