From 983a473694ff1f45956b17ee042b0feac59a04d2 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Sep 26 2007 18:52:35 +0000
Subject: - pull in fixes from upstream for media handling, pkgid (#291471), and a

    potential depsolving bug

---

diff --git a/.cvsignore b/.cvsignore
index ec1fec6..7e0a68f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-yum-3.2.3.tar.gz
-yum-3.2.4.tar.gz
 yum-3.2.5.tar.gz
diff --git a/sources b/sources
index 28a5967..082669b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-f88b40b3d4429e1a05a2e7f319f096c8  yum-3.2.4.tar.gz
 f0899caf538ed864234cafbc77d211c1  yum-3.2.5.tar.gz
diff --git a/yum.spec b/yum.spec
index 69aa180..3fb8693 100644
--- a/yum.spec
+++ b/yum.spec
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@ Patch0: installonlyn-enable.patch
 Patch1: yum-showasdep.patch
 Patch2: yum-trans-display-object.patch
 Patch3: yum-3.2.5-close.patch
+Patch4: yum-misc-fixes.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -52,6 +53,7 @@ can notify you when they are available via email, syslog or dbus.
 %patch1 -p1 -b .showdep
 %patch2 -p1 -b .transdisp
 %patch3 -p1 -b .close
+%patch4 -p1 
 
 %build
 make
@@ -97,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Sep 25 2007 Jeremy Katz <katzj@redhat.com> - 3.2.5-4
+- pull in fixes from upstream for media handling, pkgid (#291471), and 
+  a potential depsolving bug
+
 * Mon Sep 17 2007 Jeremy Katz <katzj@redhat.com> - 3.2.5-3
 - fix traceback with closing repos