[yum] - latest head - Fix PK/auto-close GPG import bug. - Fix patch for installonly_limit and enable it ag

[James Antill]

commit 2aee2fcefc57aa9543c9def0e2e8a983034b536d
Author: James Antill <james at and.org>
Date:   Tue Sep 14 12:19:28 2010 -0400

    - latest head
    - Fix PK/auto-close GPG import bug.
    - Fix patch for installonly_limit and enable it again.
    - Fix rpmlint warnings.

 installonlyn-enable.patch |   12 ++++++------
 yum.spec                  |   33 ++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 17 deletions(-)
---
diff --git a/installonlyn-enable.patch b/installonlyn-enable.patch
index b42be9a..d17a88a 100644
--- a/installonlyn-enable.patch
+++ b/installonlyn-enable.patch
@@ -10,14 +10,14 @@
      kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise',
              'kernel-bigmem', 'kernel-BOOT', 'kernel-PAE', 'kernel-PAE-debug'])
 
---- docs/yum.conf.5~	2009-05-11 11:55:25.000000000 -0400
-+++ docs/yum.conf.5	2009-05-11 11:55:25.000000000 -0400
-@@ -108,7 +108,7 @@
- 
- .IP \fBinstallonly_limit \fR
+--- docs/yum.conf.5.orig	2010-06-21 17:39:17.000000000 -0400
++++ docs/yum.conf.5	2010-09-14 12:11:40.897615896 -0400
+@@ -141,7 +141,7 @@
+ .IP
+ \fBinstallonly_limit \fR
  Number of packages listed in installonlypkgs to keep installed at the same
 -time. Setting to 0 disables this feature. Default is '0'. Note that this
 +time. Setting to 0 disables this feature. Default is '3'. Note that this
  functionality used to be in the "installonlyn" plugin, where this option was
  altered via. tokeep.
- 
+ Note that as of version 3.2.24, yum will now look in the yumdb for a installonly
diff --git a/yum.spec b/yum.spec
index fae86e9..6ef7c74 100644
--- a/yum.spec
+++ b/yum.spec
@@ -1,9 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
- 
+
+%define yum_pluginslib /usr/lib/yum-plugins
+
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.28
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -31,18 +33,19 @@ Requires: python-urlgrabber >= 3.9.0-8
 Requires: yum-metadata-parser >= 1.1.0
 Requires: pygpgme
 Obsoletes: yum-skip-broken <= 1.1.18
+Provides: yum-skip-broken = 1.1.18.yum
 Obsoletes: yum-basearchonly <= 1.1.9
 Obsoletes: yum-plugin-basearchonly <= 1.1.9
+Provides: yum-basearchonly = 1.1.9.yum
+Provides: yum-plugin-basearchonly = 1.1.9.yum
 Obsoletes: yum-allow-downgrade < 1.1.20-0
 Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0
+Provides: yum-allow-downgrade = 1.1.20-0.yum
+Provides: yum-plugin-allow-downgrade = 1.1.22-0.yum
 Obsoletes: yum-plugin-protect-packages < 1.1.27-0
+Provides: yum-protect-packages = 1.1.27-0.yum
+Provides: yum-plugin-protect-packages = 1.1.27-0.yum
 Obsoletes: yum-plugin-download-order <= 0.2-2
-Provides: yum-skip-broken
-Provides: yum-basearchonly
-Provides: yum-allow-downgrade
-Provides: yum-plugin-allow-downgrade
-Provides: yum-protect-packages
-Provides: yum-plugin-protect-packages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -67,6 +70,7 @@ can notify you when they are available via email, syslog or dbus.
 
 %prep
 %setup -q
+%patch0 -p0
 %patch1 -p0
 %patch3 -p0
 %patch4 -p0
@@ -81,7 +85,7 @@ make
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/yum.conf
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d $RPM_BUILD_ROOT/usr/lib/yum-plugins
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d $RPM_BUILD_ROOT/%{yum_pluginslib}
 
 # for now, move repodir/yum.conf back
 mv $RPM_BUILD_ROOT/%{_sysconfdir}/yum/repos.d $RPM_BUILD_ROOT/%{_sysconfdir}/yum.repos.d
@@ -101,6 +105,11 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/yum/plugins
 mkdir -p $RPM_BUILD_ROOT/var/lib/yum/yumdb
 touch $RPM_BUILD_ROOT/var/lib/yum/uuid
 
+# rpmlint bogus stuff...
+chmod +x $RPM_BUILD_ROOT/%{_datadir}/yum-cli/*.py
+chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/yum
+chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/rpmUtils
+
 %find_lang %name
 
 %clean
@@ -132,12 +141,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/yum-shell*
 # plugin stuff
 %dir %{_sysconfdir}/yum/pluginconf.d 
-%dir /usr/lib/yum-plugins
+%dir %{yum_pluginslib}
 
 %changelog
-* Tue Sep 14 2010 James Antill <james at fedoraproject.org>
+* Tue Sep 14 2010 James Antill <james at fedoraproject.org> - 3.2.28-6
 - latest head 
 - Fix PK/auto-close GPG import bug.
+- Fix patch for installonly_limit and enable it again.
+- Fix rpmlint warnings.
 
 * Fri Sep 10 2010 Seth Vidal <skvidal at fedoraproject.org>
 - latest head