[packages/yum: 1/6] updated patches from fedora, including HEAD merge
glen
glen at pld-linux.org
Mon Apr 15 11:31:24 CEST 2013
commit b4d628647303981d96f38adde47eed96be10779f
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Apr 15 09:37:54 2013 +0300
updated patches from fedora, including HEAD merge
installonlyn-enable.patch | 24 ++++++---------------
tests.patch | 16 +++++++-------
yum-amd64.patch | 24 +++++++++++----------
yum-completion-helper.patch | 11 ++++++++++
yum-distro-configs.patch | 19 +++++++++++++++++
yum-manpage-files.patch | 47 +++++++++++++++++++++++++++++-------------
yum-mirror-priority.patch | 11 ----------
yum-multilib-policy-best.patch | 11 ----------
yum.spec | 36 ++++++++++++++++++--------------
9 files changed, 111 insertions(+), 88 deletions(-)
---
diff --git a/yum.spec b/yum.spec
index f6d244c..354cb7c 100644
--- a/yum.spec
+++ b/yum.spec
@@ -8,7 +8,7 @@ Summary: RPM installer/updater
Summary(pl.UTF-8): Narzędzie do instalowania/uaktualniania pakietów RPM
Name: yum
Version: 3.4.3
-Release: 2
+Release: 2.1
License: GPL v2+
Group: Applications/System
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -24,13 +24,17 @@ Patch5: %{name}-config.patch
Patch6: nosetests.patch
Patch7: rpm5.patch
Patch8: tests.patch
+Patch9: pld-release.patch
# fc
-Patch10: installonlyn-enable.patch
-Patch11: %{name}-mirror-priority.patch
+Patch10: %{name}-HEAD.patch
+# Patch10-md5: fed00a3fcdb2ab0115bf8e1949309763
+Patch11: installonlyn-enable.patch
Patch12: %{name}-manpage-files.patch
-Patch13: %{name}-multilib-policy-best.patch
-Patch14: no-more-exactarchlist.patch
+Patch13: no-more-exactarchlist.patch
+Patch14: %{name}-completion-helper.patch
+Patch15: %{name}-distro-configs.patch
URL: http://yum.baseurl.org/
+BuildRequires: bash-completion >= 2.0
BuildRequires: gettext-devel
BuildRequires: intltool
BuildRequires: python-rpm
@@ -71,11 +75,12 @@ zapytaniu użytkownika w razie potrzeby.
%prep
%setup -q
# fc
-%patch10 -p0
+%patch10 -p1
%patch11 -p0
-%patch12 -p0
+%patch12 -p1
%patch13 -p0
-%patch14 -p0
+%patch14 -p1
+%patch15 -p1
# pld
%patch1 -p1
#%patch2 -p1
@@ -85,6 +90,7 @@ zapytaniu użytkownika w razie potrzeby.
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
%{__make}
@@ -109,17 +115,16 @@ export LC_ALL=en_US.utf8
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir}/yum/pluginconf.d,%{_libdir}/yum-plugins,%{_datadir}/yum-plugins}
-
%{__make} install \
PYLIBDIR=%{py_scriptdir} \
DESTDIR=$RPM_BUILD_ROOT
# no cron (unstable, and poldek is main pkg manager)
-%{__rm} $RPM_BUILD_ROOT/etc/cron.daily/0yum.cron
-%{__rm} $RPM_BUILD_ROOT/etc/rc.d/init.d/yum-cron
-%{__rm} $RPM_BUILD_ROOT/etc/sysconfig/yum-cron
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/yum/yum-daily.yum
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/yum/yum-weekly.yum
+%{__rm} $RPM_BUILD_ROOT/etc/cron.daily/0yum-update.cron
+%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/yum-cron.service
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/yum/yum-cron.conf
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/yum-cron
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/yum-cron.8*
# for now, move repodir/yum.conf back
mv $RPM_BUILD_ROOT%{_sysconfdir}/{yum/repos.d,/yum.repos.d}
@@ -216,4 +221,5 @@ fi
%ghost /var/lib/yum/uuid
# bash-completion subpackage
-/etc/bash_completion.d/yum.bash
+%{_datadir}/bash-completion/completions/yum
+%{_datadir}/bash-completion/completions/yummain.py
diff --git a/installonlyn-enable.patch b/installonlyn-enable.patch
index b42be9a..ee5c4c6 100644
--- a/installonlyn-enable.patch
+++ b/installonlyn-enable.patch
@@ -1,23 +1,11 @@
---- yum/config.py~ 2008-02-08 16:22:27.000000000 -0500
-+++ yum/config.py 2008-02-08 16:22:28.000000000 -0500
-@@ -593,7 +593,7 @@
- # NOTE: If you set this to 2, then because it keeps the current kernel it
- # means if you ever install an "old" kernel it'll get rid of the newest one
- # so you probably want to use 3 as a minimum ... if you turn it on.
-- installonly_limit = PositiveIntOption(0, range_min=2,
-+ installonly_limit = PositiveIntOption(3, range_min=2,
- names_of_0=["0", "<off>"])
- 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/tests.patch b/tests.patch
index c7bec40..d7e2666 100644
--- a/tests.patch
+++ b/tests.patch
@@ -1,12 +1,12 @@
---- yum-3.4.3/test/check-po-yes-no.py~ 2013-03-02 21:52:33.000000000 +0200
-+++ yum-3.4.3/test/check-po-yes-no.py 2013-03-02 21:52:41.303006222 +0200
-@@ -5,7 +5,8 @@
-
+--- yum-3.4.3/test/check-po-yes-no.py~ 2013-04-15 09:02:49.000000000 +0300
++++ yum-3.4.3/test/check-po-yes-no.py 2013-04-15 09:03:25.975416605 +0300
+@@ -6,6 +6,9 @@
import sys
import glob
--
+
+import unittest
+from testbase import *
- from yum.misc import to_utf8
-
- def trans(msg, default):
++
+ # Don't import from yum, as it isn't there when we are distro. building...
+ def to_utf8(obj, errors='replace'):
+ '''convert 'unicode' to an encoded utf-8 byte string '''
diff --git a/yum-amd64.patch b/yum-amd64.patch
index 22009b6..8ffdeb0 100644
--- a/yum-amd64.patch
+++ b/yum-amd64.patch
@@ -1,14 +1,16 @@
---- yum-3.2.28/rpmUtils/arch.py.orig 2010-07-20 16:21:32.000000000 +0300
-+++ yum-3.2.28/rpmUtils/arch.py 2010-10-22 23:51:00.055319465 +0300
-@@ -212,24 +212,10 @@
- return []
+--- yum-3.4.3/rpmUtils/arch.py~ 2013-04-15 09:00:20.000000000 +0300
++++ yum-3.4.3/rpmUtils/arch.py 2013-04-15 09:01:54.771200925 +0300
+@@ -258,27 +258,9 @@
+ offset = offset + fmtlen
def getCanonX86Arch(arch):
- #
if arch == "i586":
- for line in _try_read_cpuinfo():
-- if line.startswith("model name") and line.find("Geode(TM)") != -1:
-- return "geode"
+- if line.startswith("model name"):
+- if line.find("Geode(TM)") != -1:
+- return "geode"
+- break
- return arch
- # only athlon vs i686 isn't handled with uname currently
- if arch != "i686":
@@ -19,15 +21,15 @@
- if line.startswith("vendor") and line.find("AuthenticAMD") != -1:
- return "athlon"
- # i686 doesn't guarantee cmov, but we depend on it
-- elif line.startswith("flags") and line.find("cmov") == -1:
-- return "i586"
--
+- elif line.startswith("flags"):
+- if line.find("cmov") == -1:
+- return "i586"
+- break
+ # nearest matching arch in Th is i486
+ return "i486"
-+ # not sure what we have here
+
return arch
- def getCanonPPCArch(arch):
@@ -275,24 +261,6 @@
return "sparcv8"
return arch
diff --git a/yum-completion-helper.patch b/yum-completion-helper.patch
new file mode 100644
index 0000000..44e6c73
--- /dev/null
+++ b/yum-completion-helper.patch
@@ -0,0 +1,11 @@
+diff -up yum-3.4.3/completion-helper.py.old yum-3.4.3/completion-helper.py
+--- yum-3.4.3/completion-helper.py.old 2012-08-22 17:00:47.444104234 +0200
++++ yum-3.4.3/completion-helper.py 2012-08-22 17:00:57.954647525 +0200
+@@ -70,6 +70,7 @@ def get_pattern(extcmds):
+
+ def main(args):
+ base = cli.YumBaseCli()
++ base.setCacheDir = lambda *x: True # use the system cachedir
+ base.yum_cli_commands.clear()
+ base.registerCommand(GroupsCompletionCommand())
+ base.registerCommand(ListCompletionCommand())
diff --git a/yum-distro-configs.patch b/yum-distro-configs.patch
new file mode 100644
index 0000000..a4608a2
--- /dev/null
+++ b/yum-distro-configs.patch
@@ -0,0 +1,19 @@
+diff -ru yum-3.4.3-orig/yum/config.py yum-3.4.3/yum/config.py
+--- yum-3.4.3-orig/yum/config.py 2011-12-02 15:45:41.617448597 -0500
++++ yum-3.4.3/yum/config.py 2011-12-02 15:46:20.576285275 -0500
+@@ -45,10 +45,10 @@
+ # Alter/patch these to change the default checking...
+ __pkgs_gpgcheck_default__ = False
+ __repo_gpgcheck_default__ = False
+-__main_multilib_policy_default__ = 'all'
+-__main_failovermethod_default__ = 'roundrobin'
+-__main_installonly_limit_default__ = 0
+-__group_command_default__ = 'compat'
++__main_multilib_policy_default__ = 'best'
++__main_failovermethod_default__ = 'priority'
++__main_installonly_limit_default__ = 3
++__group_command_default__ = 'objects'
+
+ class Option(object):
+ """
+Only in yum-3.4.3/yum: config.py~
diff --git a/yum-manpage-files.patch b/yum-manpage-files.patch
index 0e713f1..f688725 100644
--- a/yum-manpage-files.patch
+++ b/yum-manpage-files.patch
@@ -1,19 +1,38 @@
---- docs/yum.8~ 2009-10-12 16:58:13.000000000 +0300
-+++ docs/yum.8 2010-02-03 01:50:03.221231119 +0200
-@@ -474,9 +474,9 @@
+commit 102915d4d402493c48d434ae1d1756225c4468e0
+Author: James Antill <james at and.org>
+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/<plugin_name>.conf and the \fBenabled\fR setting in this
+@@ -584,9 +584,9 @@ configuration options.
.PP
.SH "FILES"
.nf
-/etc/yum/yum.conf
+/etc/yum.conf
-+/etc/yum.repos.d/
/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"
@@ -27,9 +46,9 @@
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
@@ -39,8 +58,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
@@ -51,7 +70,7 @@
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
@@ -60,5 +79,5 @@
+/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-mirror-priority.patch b/yum-mirror-priority.patch
deleted file mode 100644
index 259a365..0000000
--- a/yum-mirror-priority.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- yum/config.py~ 2008-03-04 16:21:49.000000000 -0500
-+++ yum/config.py 2008-03-04 16:21:49.000000000 -0500
-@@ -582,7 +582,7 @@
-
- commands = ListOption()
- exclude = ListOption()
-- failovermethod = Option('roundrobin')
-+ failovermethod = Option('priority')
- proxy = UrlOption(schemes=('http', 'ftp', 'https'), allow_none=True)
- proxy_username = Option()
- proxy_password = Option()
diff --git a/yum-multilib-policy-best.patch b/yum-multilib-policy-best.patch
deleted file mode 100644
index 065047b..0000000
--- a/yum-multilib-policy-best.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- yum/config.py~ 2009-10-14 15:52:38.000000000 -0400
-+++ yum/config.py 2009-10-14 15:59:57.000000000 -0400
-@@ -670,7 +670,7 @@
- # similar but better :).
- mdpolicy = ListOption(['group:primary'])
- # ('instant', 'group:all', 'group:main', 'group:small', 'group:primary'))
-- multilib_policy = SelectionOption('all',('best', 'all'))
-+ multilib_policy = SelectionOption('best',('best', 'all'))
- # all == install any/all arches you can
- # best == use the 'best arch' for the system
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/yum.git/commitdiff/5ed5d736476bf6570e7729137e83c890b12e3839
More information about the pld-cvs-commit
mailing list