packages: yum/yum-chroot.patch, yum/yum.spec - add fc patches, depends on u...

[glen]

Author: glen                         Date: Wed Feb  3 00:30:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add fc patches, depends on urlgrabber 3.9

---- Files affected:
packages/yum:
   yum-chroot.patch (1.13 -> 1.14) , yum.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: packages/yum/yum-chroot.patch
diff -u packages/yum/yum-chroot.patch:1.13 packages/yum/yum-chroot.patch:1.14
--- packages/yum/yum-chroot.patch:1.13	Wed Nov 18 13:17:14 2009
+++ packages/yum/yum-chroot.patch	Wed Feb  3 01:29:56 2010
@@ -1,5 +1,5 @@
---- yum-3.2.23.orig/cli.py	2009-05-14 18:41:21.000000000 +0200
-+++ yum-3.2.23/cli.py	2009-08-06 00:34:04.380934519 +0200
+--- yum-3.2.25/cli.py~	2010-02-03 01:50:50.000000000 +0200
++++ yum-3.2.25/cli.py	2010-02-03 01:51:27.320806001 +0200
 @@ -1243,13 +1243,14 @@
      def getRoot(self,opts):
          # If the conf file is inside the  installroot - use that.
@@ -21,15 +21,15 @@
              root=opts.installroot
          else:
              root = '/'
-@@ -1288,7 +1289,7 @@
-                 help=_("be tolerant of errors"))
-         group.add_option("-C", dest="cacheonly", action="store_true",
-                 help=_("run entirely from cache, don't update cache"))
--        group.add_option("-c", dest="conffile", default='/etc/yum/yum.conf',
-+        group.add_option("-c", dest="conffile", default=None,
-                 help=_("config file location"), metavar=' [config file]')
-         group.add_option("-R", dest="sleeptime", type='int', default=None,
-                 help=_("maximum command wait time"), metavar=' [minutes]')
+@@ -1324,7 +1324,7 @@
+                 action="store_true",
+                 help=_("run entirely from system cache, don't update cache"))
+         group.add_option("-c", "--config", dest="conffile",
+-                default='/etc/yum/yum.conf',
++                default=None,
+                 help=_("config file location"), metavar='[config file]')
+         group.add_option("-R", "--randomwait", dest="sleeptime", type='int',
+                 default=None,
 --- yum-3.2.25/docs/yum.conf.5~	2009-10-12 16:58:13.000000000 +0300
 +++ yum-3.2.25/docs/yum.conf.5	2009-11-18 13:34:13.578656364 +0200
 @@ -24,8 +24,10 @@

================================================================
Index: packages/yum/yum.spec
diff -u packages/yum/yum.spec:1.80 packages/yum/yum.spec:1.81
--- packages/yum/yum.spec:1.80	Wed Feb  3 00:40:37 2010
+++ packages/yum/yum.spec	Wed Feb  3 01:29:56 2010
@@ -5,7 +5,7 @@
 Summary(pl.UTF-8):	Narzędzie do instalowania/uaktualniania pakietów RPM
 Name:		yum
 Version:	3.2.25
-Release:	2.2
+Release:	2.8
 License:	GPL
 Group:		Applications/System
 BuildRequires:	rpmbuild(macros) >= 1.219
@@ -19,6 +19,13 @@
 Patch3:		%{name}-pld.patch
 Patch4:		%{name}-amd64.patch
 Patch5:		%{name}-config.patch
+# fc
+Patch10:	installonlyn-enable.patch
+Patch11:	%{name}-mirror-priority.patch
+Patch12:	%{name}-manpage-files.patch
+Patch13:	%{name}-multilib-policy-best.patch
+Patch14:	no-more-exactarchlist.patch
+Patch16:	%{name}-HEAD.patch
 URL:		http://yum.baseurl.org/
 BuildRequires:	gettext-devel
 BuildRequires:	intltool
@@ -30,7 +37,7 @@
 Requires:	python-pygpgme
 Requires:	python-rpm
 Requires:	python-sqlite
-Requires:	python-urlgrabber >= 3.9.0-8
+Requires:	python-urlgrabber >= 1:3.9.1
 Requires:	rpm >= 4.4.2
 Requires:	yum-metadata-parser >= 1.1.0
 BuildArch:	noarch
@@ -50,6 +57,14 @@
 
 %prep
 %setup -q
+# fc
+%patch10 -p0
+%patch11 -p0
+%patch12 -p0
+%patch13 -p0
+%patch14 -p0
+%patch16 -p1
+# pld
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -146,12 +161,18 @@
 
 /var/cache/yum
 
+# bash-completion subpackage
+/etc/bash_completion.d/yum.bash
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2010/02/03 00:29:56  glen
+- add fc patches, depends on urlgrabber 3.9
+
 Revision 1.80  2010/02/02 23:40:37  glen
 - yum-updatesd has moved to the separate source version
 - /etc/yum/repos.d -> /etc/yum.repos.d change to match fedora
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/yum/yum-chroot.patch?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/yum/yum.spec?r1=1.80&r2=1.81&f=u