use the correct version

diff --git a/original/yum.spec b/original/yum.spec
index 4e0a59d..afe4ccb 100644 (file)
--- a/original/yum.spec
+++ b/original/yum.spec
@@ -3,16 +3,13 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.22
-Release: 26%{?dist}
+Release: 33%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
+Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
 Source1: yum.conf.fedora
 Source2: yum-updatesd.conf.fedora
 
-#  See: http://people.redhat.com/jantill/gits/yum branch el-5.3-master
-# and the el5.3* branches for the individual patches.
-
 # Fedora patches we might as well carry
 Patch0: installonlyn-enable.patch
 Patch1: yum-mirror-priority.patch
@@ -54,7 +51,15 @@ Patch207: BZ-529719-base_package_name-compare_providers.patch
 Patch208: BZ-548582-excludes-source-repos-crash.patch
 Patch209: BZ-523135-newest-obs-only.patch
 
-URL: http://linux.duke.edu/yum/
+# 5.6 patches...
+Patch210: BZ-500721-sslverify-control-name-cert-mismatch.patch
+Patch211: BZ-593349-install-obs-pkg-wrong-arch.patch
+Patch212: BZ-628963-Handle-generated-.sqlite-files,-for-unique-.xml-MD.patch
+Patch213: BZ-623955-traceback-no-proc-mounted.patch
+Patch214: BZ-637146-document-ssl-options.patch
+Patch215: BZ-634119-parse-enhanced-updateinfo-MD.patch
+
+URL: http://yum.baseurl.org/
 BuildArchitectures: noarch
 BuildRequires: python
 BuildRequires: gettext
@@ -68,7 +73,6 @@ Requires: urlgrabber >= 3.1.0
 Requires: python-elementtree
 # Make sure metadata code is updated too
 Requires: yum-metadata-parser >= 1.1.0
-Requires: yum-fastestmirror
 Conflicts: yum-rhn-plugin < 0.5.3-30.el5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: yum-skip-broken
@@ -82,7 +86,6 @@ Conflicts: yum-utils < 1.1.16-11
 # Requires: pygpgme
 Obsoletes: yum-allow-downgrade < 1.1.20-0
 Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0
-Obsoletes: yum-repolist
 
 %description
 Yum is a utility that can check for and automatically download and
@@ -141,6 +144,13 @@ can notify you when they are available via email, syslog or dbus.
 %patch208 -p1
 %patch209 -p1
 
+%patch210 -p1
+%patch211 -p1
+%patch212 -p1
+%patch213 -p1
+%patch214 -p1
+%patch215 -p1
+
 %build
 make
 
@@ -190,10 +200,31 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/yum-cli/yumupd.py*
 %dir /usr/lib/yum-plugins
 
 %changelog
-* Sun Apr 04 2010 Karanbir Singh <kbsingh@centos.org> - 3.2.22-26.el5.centos
-- Make installonly be 5
-- Require fastest mirror plugin
-- Obsolete yum-repolist
+* Tue Nov  2 2010 James Antill <jantill@redhat.com> - 3.2.22-33
+- Parse enhanced updateinfo MD.
+- Resolves: rhbz#634119
+
+* Tue Sep 28 2010 James Antill <jantill@redhat.com> - 3.2.22-32
+- Document ssl options.
+- Resolves: rhbz#637146
+
+* Tue Sep 21 2010 James Antill <jantill@redhat.com> - 3.2.22-30
+- Fix traceback when there is no proc mounted.
+- Resolves: rhbz#623955
+
+* Fri Sep 17 2010 James Antill <jantill@redhat.com> - 3.2.22-29
+- Fix patch for, install of obsoleted pkg is wrong arch.
+- Resolves: rhbz#593349
+
+* Tue Sep 14 2010 James Antill <jantill@redhat.com> - 3.2.22-28
+- Handle generated .sqlite files, for unique .xml MD.
+- Resolves: rhbz#628963
+
+* Wed Aug 11 2010 James Antill <jantill@redhat.com> - 3.2.22-27
+- Make sslverify control name cert mismatch (requires newer m2crypto)
+- Resolves: rhbz#500721
+- Fix install of obsoleted pkg is wrong arch
+- Resolves: rhbz#593349
 
 * Tue Feb 23 2010 James Antill <jantill@redhat.com> - 3.2.22-26
 - Only look at the newest packages for obsoletes, again.

diff --git a/sources b/sources
index b797014..4287ddb 100644 (file)
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c7669e5f1f9be9ff123a233414819ef70a0c002 http://build.planet-lab.org/third-party/yum-3.2.22-26.el5.centos.src.rpm
+262801f7d93323769ce9f582eb3caa9fc82bbf55 http://ftp.redhat.com/pub/redhat/linux/enterprise/5Server/en/os/SRPMS/yum-3.2.22-33.el5.src.rpm

diff --git a/yum.spec b/yum.spec
index c818515..c0f68d6 100644 (file)
--- a/yum.spec
+++ b/yum.spec
@@ -3,16 +3,13 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.22
-Release: 26%{?dist}.chroot1
+Release: 33%{?dist}.chroot1
 License: GPLv2+
 Group: System Environment/Base
-Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
+Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
 Source1: yum.conf.fedora
 Source2: yum-updatesd.conf.fedora
 
-#  See: http://people.redhat.com/jantill/gits/yum branch el-5.3-master
-# and the el5.3* branches for the individual patches.
-
 # Fedora patches we might as well carry
 Patch0: installonlyn-enable.patch
 Patch1: yum-mirror-priority.patch
@@ -54,9 +51,17 @@ Patch207: BZ-529719-base_package_name-compare_providers.patch
 Patch208: BZ-548582-excludes-source-repos-crash.patch
 Patch209: BZ-523135-newest-obs-only.patch
 
+# 5.6 patches...
+Patch210: BZ-500721-sslverify-control-name-cert-mismatch.patch
+Patch211: BZ-593349-install-obs-pkg-wrong-arch.patch
+Patch212: BZ-628963-Handle-generated-.sqlite-files,-for-unique-.xml-MD.patch
+Patch213: BZ-623955-traceback-no-proc-mounted.patch
+Patch214: BZ-637146-document-ssl-options.patch
+Patch215: BZ-634119-parse-enhanced-updateinfo-MD.patch
+
 Patch1000: yum-3.2.22-chroot.patch
 
-URL: http://linux.duke.edu/yum/
+URL: http://yum.baseurl.org/
 BuildArchitectures: noarch
 BuildRequires: python
 BuildRequires: gettext
@@ -70,7 +75,6 @@ Requires: urlgrabber >= 3.1.0
 Requires: python-elementtree
 # Make sure metadata code is updated too
 Requires: yum-metadata-parser >= 1.1.0
-Requires: yum-fastestmirror
 Conflicts: yum-rhn-plugin < 0.5.3-30.el5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: yum-skip-broken
@@ -84,7 +88,6 @@ Conflicts: yum-utils < 1.1.16-11
 # Requires: pygpgme
 Obsoletes: yum-allow-downgrade < 1.1.20-0
 Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0
-Obsoletes: yum-repolist
 
 %description
 Yum is a utility that can check for and automatically download and
@@ -143,6 +146,13 @@ can notify you when they are available via email, syslog or dbus.
 %patch208 -p1
 %patch209 -p1
 
+%patch210 -p1
+%patch211 -p1
+%patch212 -p1
+%patch213 -p1
+%patch214 -p1
+%patch215 -p1
+
 %patch1000 -p1
 
 %build
@@ -194,10 +204,31 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/yum-cli/yumupd.py*
 %dir /usr/lib/yum-plugins
 
 %changelog
-* Sun Apr 04 2010 Karanbir Singh <kbsingh@centos.org> - 3.2.22-26.el5.centos
-- Make installonly be 5
-- Require fastest mirror plugin
-- Obsolete yum-repolist
+* Tue Nov  2 2010 James Antill <jantill@redhat.com> - 3.2.22-33
+- Parse enhanced updateinfo MD.
+- Resolves: rhbz#634119
+
+* Tue Sep 28 2010 James Antill <jantill@redhat.com> - 3.2.22-32
+- Document ssl options.
+- Resolves: rhbz#637146
+
+* Tue Sep 21 2010 James Antill <jantill@redhat.com> - 3.2.22-30
+- Fix traceback when there is no proc mounted.
+- Resolves: rhbz#623955
+
+* Fri Sep 17 2010 James Antill <jantill@redhat.com> - 3.2.22-29
+- Fix patch for, install of obsoleted pkg is wrong arch.
+- Resolves: rhbz#593349
+
+* Tue Sep 14 2010 James Antill <jantill@redhat.com> - 3.2.22-28
+- Handle generated .sqlite files, for unique .xml MD.
+- Resolves: rhbz#628963
+
+* Wed Aug 11 2010 James Antill <jantill@redhat.com> - 3.2.22-27
+- Make sslverify control name cert mismatch (requires newer m2crypto)
+- Resolves: rhbz#500721
+- Fix install of obsoleted pkg is wrong arch
+- Resolves: rhbz#593349
 
 * Tue Feb 23 2010 James Antill <jantill@redhat.com> - 3.2.22-26
 - Only look at the newest packages for obsoletes, again.