From c542e5e8afa84aca8347ac6bad16164b2d130868 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@fedoraproject.org>
Date: Dec 09 2008 13:28:08 +0000
Subject: - update to rpm 4.6.0-rc3

- fixes #475214, #474550, #473239

---

diff --git a/.cvsignore b/.cvsignore
index 84f16dc..da102f0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rpm-4.6.0-rc2.tar.bz2
+rpm-4.6.0-rc3.tar.bz2
diff --git a/rpm-4.5.90-rpmfileutil.patch b/rpm-4.5.90-rpmfileutil.patch
deleted file mode 100644
index db2976e..0000000
--- a/rpm-4.5.90-rpmfileutil.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 0b80d38f32b438d81d47fc61074b1f163518d68f
-Author: Jindrich Novy <jnovy@redhat.com>
-Date:   Mon Dec 1 12:16:56 2008 +0100
-
-    Include rpmfileutil.h from rpmmacro.h so that
-    prototype for rpmGenPath() is included (rhbz#473420)
-    - unbreaks net-snmp
-
-diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
-index 7391efd..765c78c 100644
---- a/rpmio/rpmmacro.h
-+++ b/rpmio/rpmmacro.h
-@@ -9,6 +9,7 @@
- #include <stddef.h>
- 
- #include <rpm/rpmutil.h>
-+#include <rpm/rpmfileutil.h>
- 
- #ifdef __cplusplus
- extern "C" {
diff --git a/rpm-4.6.0-rc2-pkgconfig-provides.patch b/rpm-4.6.0-rc2-pkgconfig-provides.patch
deleted file mode 100644
index 158d67b..0000000
--- a/rpm-4.6.0-rc2-pkgconfig-provides.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/scripts/pkgconfigdeps.sh b/scripts/pkgconfigdeps.sh
-index 882d195..6baa0f1 100755
---- a/scripts/pkgconfigdeps.sh
-+++ b/scripts/pkgconfigdeps.sh
-@@ -17,6 +17,8 @@ case $1 in
-     case "${filename}" in
-     *.pc)
- 	# Query the dependencies of the package.
-+	DIR="`dirname ${filename}`"
-+	export PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
- 	$pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do
- 	    # We have a dependency.  Make a note that we need the pkgconfig
- 	    # tool for this package.
diff --git a/rpm.spec b/rpm.spec
index f5a69ed..91ad788 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -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 @@ Source1: db-%{bdbver}.tar.gz
 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 @@ that will manipulate RPM packages and databases.
 %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 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Dec 09 2008 Panu Matilainen <pmatilai@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@redhat.com> - 4.6.0-0.rc2.9
 - I built into the wrong place
 
diff --git a/sources b/sources
index 9691cf8..d9dda3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a8f0f5871fa7915d3443a8f82f1f60d  rpm-4.6.0-rc2.tar.bz2
+8f4f5f8a05fa4f4dfe34119d1059d3ce  rpm-4.6.0-rc3.tar.bz2