diff --git a/sources b/sources index 46923a9..fa09d52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b2b84be5fad612c4c698e37cc8510492 yum-3.2.27.tar.gz +91eff58aa4c25cd4f46b21201bbf9bea yum-3.2.28.tar.gz diff --git a/yum-manpage-files.patch b/yum-manpage-files.patch index 4681ac5..f688725 100644 --- a/yum-manpage-files.patch +++ b/yum-manpage-files.patch @@ -1,20 +1,38 @@ -diff -urN olddocs/yum.8 docs/yum.8 ---- olddocs/yum.8 2008-03-17 12:09:29.000000000 -0400 -+++ docs/yum.8 2008-03-17 12:08:18.000000000 -0400 -@@ -339,8 +339,8 @@ +commit 102915d4d402493c48d434ae1d1756225c4468e0 +Author: James Antill +Date: Mon Jun 14 01:15:21 2010 -0400 + + Port manpage files path fixups. + +diff --git a/docs/yum.8 b/docs/yum.8 +index d5ede0a..3bdb408 100644 +--- a/docs/yum.8 ++++ b/docs/yum.8 +@@ -568,7 +568,7 @@ option in yum.conf. For a plugin to work, the following conditions must be met: + 1. The plugin module file must be installed in the plugin path as just + described. + .LP +-2. The global \fBplugins\fP option in /etc/yum/yum.conf must be set to `1'. ++2. The global \fBplugins\fP option in /etc/yum.conf must be set to `1'. + .LP + 3. A configuration file for the plugin must exist in + /etc/yum/pluginconf.d/.conf and the \fBenabled\fR setting in this +@@ -584,9 +584,9 @@ configuration options. .PP .SH "FILES" .nf -/etc/yum/yum.conf --/etc/yum/repos.d/ +/etc/yum.conf + /etc/yum/version-groups.conf +-/etc/yum/repos.d/ +/etc/yum.repos.d/ /etc/yum/pluginconf.d/ /var/cache/yum/ .fi - ---- olddocs/yum.conf.5.orig 2009-01-21 13:33:04.000000000 -0500 -+++ docs/yum.conf.5 2009-01-21 13:34:47.000000000 -0500 +diff --git a/docs/yum.conf.5 b/docs/yum.conf.5 +index ca36103..42815b9 100644 +--- a/docs/yum.conf.5 ++++ b/docs/yum.conf.5 @@ -4,10 +4,10 @@ \fByum.conf\fR \- Configuration file for \fByum(8)\fR. .SH "DESCRIPTION" @@ -28,9 +46,9 @@ diff -urN olddocs/yum.8 docs/yum.8 See the \fBreposdir\fR option below for further details. .SH "PARAMETERS" -@@ -38,10 +38,10 @@ - - .IP \fBreposdir\fR +@@ -42,10 +42,10 @@ of headers and packages after successful installation. Default is '1' + .IP + \fBreposdir\fR A list of directories where yum should look for .repo files which define -repositories to use. Default is `/etc/yum/repos.d'. Each +repositories to use. Default is `/etc/yum.repos.d'. Each @@ -40,8 +58,8 @@ diff -urN olddocs/yum.8 docs/yum.8 +repositories defined in /etc/yum.conf to form the complete set of repositories that yum will use. - .IP \fBdebuglevel\fR -@@ -511,8 +511,8 @@ + .IP +@@ -745,8 +745,8 @@ for any given command. Defaults to False. .SH "URL INCLUDE SYNTAX" .LP @@ -52,7 +70,7 @@ diff -urN olddocs/yum.8 docs/yum.8 line of the following format: include=url://to/some/location -@@ -549,8 +549,8 @@ +@@ -812,8 +812,8 @@ data in any value. .SH "FILES" .nf @@ -61,5 +79,5 @@ diff -urN olddocs/yum.8 docs/yum.8 +/etc/yum.conf +/etc/yum.repos.d/ /etc/yum/pluginconf.d/ - - .SH "SEE ALSO" + /etc/yum/protected.d + /etc/yum/vars diff --git a/yum.spec b/yum.spec index 32bc78c..bc8aa5d 100644 --- a/yum.spec +++ b/yum.spec @@ -2,8 +2,8 @@ Summary: RPM installer/updater Name: yum -Version: 3.2.27 -Release: 4%{?dist} +Version: 3.2.28 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -15,10 +15,9 @@ Patch2: yum-manpage-files.patch Patch3: yum-multilib-policy-best.patch Patch4: no-more-exactarchlist.patch Patch5: geode-arch.patch -Patch6: yum-HEAD.patch -Patch7: yum-do-not-overwrite-keys.patch -Patch8: reget-metadata-size-fix.patch -Patch9: chroot-without-dupe-path.patch + +Patch20: yum-manpage-files.patch + URL: http://yum.baseurl.org/ BuildArch: noarch @@ -69,10 +68,8 @@ can notify you when they are available via email, syslog or dbus. %patch3 -p0 %patch4 -p0 %patch5 -p1 -#%%%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 + +%patch20 -p1 %build make @@ -123,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/yum-plugins %changelog +* Fri Jul 30 2010 Seth Vidal - 3.2.28-1 +- bump to 3.2.28 +- add manpage patch + * Mon May 3 2010 Seth Vidal - 3.2.27-4 - add patch to not add a duplicate chroot path - fixes yumdb and history from anaconda installs