rpms/yum/F-7 installonlyn-enable.patch, NONE, 1.1 sources, 1.58, 1.59 yum.spec, 1.159, 1.160

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/extras/rpms/yum/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16933

Modified Files:
	sources yum.spec 
Added Files:
	installonlyn-enable.patch 
Log Message:
3.2.2 for F-7



installonlyn-enable.patch:

--- NEW FILE installonlyn-enable.patch ---
--- yum/config.py~	2007-07-20 15:26:14.000000000 -0400
+++ yum/config.py	2007-07-20 15:26:14.000000000 -0400
@@ -490,7 +490,7 @@
     installonlypkgs = ListOption(['kernel', 'kernel-bigmem',
             'kernel-enterprise','kernel-smp', 'kernel-modules', 'kernel-debug',
             'kernel-unsupported', 'kernel-source', 'kernel-devel'])            
-    installonly_limit = IntOption(0)
+    installonly_limit = IntOption(2)
     kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise',
             'kernel-bigmem', 'kernel-BOOT'])
     exactarchlist = ListOption(['kernel', 'kernel-smp', 'glibc',


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yum/F-7/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	21 Jun 2007 19:29:14 -0000	1.58
+++ sources	23 Jul 2007 14:01:24 -0000	1.59
@@ -1 +1 @@
-a828e7a464d361de94e58c9691588f37  yum-3.2.1.tar.gz
+c6a9e8cc846fe9d080d61bd1b2146cfc  yum-3.2.2.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/F-7/yum.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- yum.spec	21 Jun 2007 19:29:14 -0000	1.159
+++ yum.spec	23 Jul 2007 14:01:24 -0000	1.160
@@ -2,20 +2,17 @@
 
 Summary: RPM installer/updater
 Name: yum
-Version: 3.2.1
+Version: 3.2.2
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
 Source1: yum.conf.fedora
 Source2: yum-updatesd.conf.fedora
-
-Source99: plugin.conf
-# default plugins here
-Source100: installonlyn.py
+Patch0: installonlyn-enable.patch
 
 URL: http://linux.duke.edu/yum/
-BuildArchitectures: noarch
+BuildArch: noarch
 BuildRequires: python
 BuildRequires: gettext
 Conflicts: pirut < 1.1.4
@@ -47,6 +44,8 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .installonly
+
 
 %build
 make
@@ -54,19 +53,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/yum.conf
+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
 
-install -m 644 %{SOURCE100} $RPM_BUILD_ROOT/usr/lib/yum-plugins/installonlyn.py
-install -m 644 %{SOURCE99} $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/installonlyn.conf
-cat >> $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d/installonlyn.conf << EOF
-# this sets the number of package versions which are kept
-tokeep=2
-EOF
 
 # install yum-updatesd
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/yum/yum-updatesd.conf
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-updatesd.conf
 
 # for now, move repodir/yum.conf back
 mv $RPM_BUILD_ROOT/%{_sysconfdir}/yum/repos.d $RPM_BUILD_ROOT/%{_sysconfdir}/yum.repos.d
@@ -88,7 +81,7 @@
 exit 0
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc README AUTHORS COPYING TODO INSTALL ChangeLog
 %config(noreplace) %{_sysconfdir}/yum.conf
 %dir %{_sysconfdir}/yum
@@ -104,12 +97,10 @@
 %{_mandir}/man*/yum-shell*
 # plugin stuff
 %dir %{_sysconfdir}/yum/pluginconf.d 
-%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/*
 %dir /usr/lib/yum-plugins
-/usr/lib/yum-plugins/*
 
 %files updatesd
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %config(noreplace) %{_sysconfdir}/yum/yum-updatesd.conf
 %config %{_sysconfdir}/rc.d/init.d/yum-updatesd
 %config %{_sysconfdir}/dbus-1/system.d/yum-updatesd.conf
@@ -118,9 +109,18 @@
 
 
 %changelog
+* Fri Jul 20 2007 Seth Vidal <skvidal at fedoraproject.org>
+- 3.2.2
+- disable unused installonlyn plugin
+- set installonly_limit to '2'
+
+* Tue Jul 10 2007 James Bowes <jbowes at redhat.com> - 3.2.1-2
+- defattr, buldarch, and macro suggestions from the merge review
+
 * Thu Jun 21 2007 Seth Vidal <skvidal at fedoraproject.org> - 3.2.1-1
 - bump to 3.2.1
 
+
 * Wed May 16 2007 Seth Vidal <skvidal at fedoraproject.org> - 3.2.0-1
 - pull out yum-misc-fixes patch
 - bump to 3.2.0