[packages/yum] update yum-HEAD.patch from fedora
glen
glen at pld-linux.org
Sun Jun 15 19:44:00 CEST 2014
commit 924160069063423c0b7827d21999e31da832d0f2
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Jun 15 20:43:34 2014 +0300
update yum-HEAD.patch from fedora
no-more-exactarchlist.patch | 37 +++++++++++++++++++++++++-----------
nosetests.patch | 7 +++----
pld-release.patch | 12 ++++++------
rpm5-yum.patch | 46 ---------------------------------------------
yum-distro-configs.patch | 14 ++++++--------
yum-missingok.patch | 25 ++++++++++++------------
yum.spec | 26 ++++++++++++++-----------
7 files changed, 68 insertions(+), 99 deletions(-)
---
diff --git a/yum.spec b/yum.spec
index ea26526..d0d6bb1 100644
--- a/yum.spec
+++ b/yum.spec
@@ -14,7 +14,7 @@ Summary: RPM installer/updater
Summary(pl.UTF-8): Narzędzie do instalowania/uaktualniania pakietów RPM
Name: yum
Version: 3.4.3
-Release: 7
+Release: 8
License: GPL v2+
Group: Applications/System
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -39,7 +39,7 @@ Patch13: %{name}-info-no-size.patch
Patch14: %{name}-pkgspec-at.patch
# fc
Patch100: %{name}-HEAD.patch
-# Patch100-md5: e9eff22b1a68e83b271bdec261411648
+# Patch100-md5: 4523cba9793fabb2d4b922b911701024
Patch101: installonlyn-enable.patch
Patch102: %{name}-manpage-files.patch
Patch103: no-more-exactarchlist.patch
@@ -102,7 +102,7 @@ bash-completion for Yum.
%patch100 -p1
%patch101 -p0
%patch102 -p1
-%patch103 -p0
+%patch103 -p1
%patch104 -p1
%patch105 -p1
# pld
@@ -144,18 +144,22 @@ 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 \
+%{__make} install -j1 \
+ INIT=systemd \
+ UNITDIR=%{systemdunitdir} \
PYLIBDIR=%{py_scriptdir} \
DESTDIR=$RPM_BUILD_ROOT
# no cron (unstable, and poldek is main pkg manager)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/yum-cron.8*
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/yum-cron
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/yum/yum-cron-hourly.conf
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/yum/yum-cron-security.conf
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/yum/yum-cron.conf
+%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/yum-cron.service
%{__rm} $RPM_BUILD_ROOT/etc/cron.daily/0yum-daily.cron
+%{__rm} $RPM_BUILD_ROOT/etc/cron.daily/0yum-security.cron
%{__rm} $RPM_BUILD_ROOT/etc/cron.hourly/0yum-hourly.cron
-%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/yum-cron.service
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/yum/yum-cron.conf
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/yum/yum-cron-hourly.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}
@@ -252,5 +256,5 @@ fi
%files -n bash-completion-%{name}
%defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/yum
-%{_datadir}/bash-completion/completions/yummain.py
+%{bash_compdir}/yum
+%{bash_compdir}/yummain.py
diff --git a/no-more-exactarchlist.patch b/no-more-exactarchlist.patch
index 23572c6..0812c7e 100644
--- a/no-more-exactarchlist.patch
+++ b/no-more-exactarchlist.patch
@@ -1,13 +1,28 @@
---- yum/config.py~ 2009-07-22 12:47:52.000000000 -0400
-+++ yum/config.py 2009-07-22 12:48:39.000000000 -0400
-@@ -631,9 +631,7 @@
+--- yum-3.4.3/yum/config.py~ 2014-06-14 16:42:42.000000000 +0300
++++ yum-3.4.3/yum/config.py 2014-06-14 16:47:26.499590981 +0300
+@@ -50,10 +50,11 @@
+ __main_failovermethod_default__ = 'roundrobin'
+ __main_installonly_limit_default__ = 0
+ __group_command_default__ = 'compat'
+-__exactarchlist_default__ = ['kernel', 'kernel-smp',
+- 'kernel-hugemem', 'kernel-enterprise',
+- 'kernel-bigmem',
+- 'kernel-devel', 'kernel-PAE', 'kernel-PAE-debug']
++__kernelpkgnames_default__ = ['kernel','kernel-smp', 'kernel-longterm', 'kernel-3.4', 'kernel-3.10']
++__installonlypkgs_default__ = __kernelpkgnames_default__ + [
++ 'installonlypkg(kernel)', 'installonlypkg(kernel-module)', 'installonlypkg(vm)'
++]
++__exactarchlist_default__ = []
+
+ class Option(object):
+ """
+@@ -766,8 +767,7 @@
+ installonly_limit = PositiveIntOption(__main_installonly_limit_default__,
+ range_min=2,
names_of_0=["0", "<off>"])
- kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise',
- 'kernel-bigmem', 'kernel-BOOT', 'kernel-PAE', 'kernel-PAE-debug'])
-- exactarchlist = ListOption(['kernel', 'kernel-smp',
-- 'kernel-hugemem', 'kernel-enterprise', 'kernel-bigmem',
-- 'kernel-devel', 'kernel-PAE', 'kernel-PAE-debug'])
-+ exactarchlist = ListOption([])
+- kernelpkgnames = ListOption(['kernel','kernel-smp', 'kernel-enterprise',
+- 'kernel-bigmem', 'kernel-BOOT', 'kernel-PAE', 'kernel-PAE-debug'])
++ kernelpkgnames = ListOption(__kernelpkgnames_default__)
+ exactarchlist = ListOption(__exactarchlist_default__)
tsflags = ListOption()
-
- assumeyes = BoolOption(False)
+ override_install_langs = Option()
diff --git a/nosetests.patch b/nosetests.patch
index a1efb52..05be497 100644
--- a/nosetests.patch
+++ b/nosetests.patch
@@ -1,5 +1,5 @@
---- yum-3.4.3/Makefile~ 2011-06-28 23:27:22.000000000 +0300
-+++ yum-3.4.3/Makefile 2013-03-02 21:23:54.119843970 +0200
+--- yum-3.4.3/Makefile~ 2014-06-14 16:49:47.000000000 +0300
++++ yum-3.4.3/Makefile 2014-06-14 16:51:00.906026665 +0300
@@ -8,6 +8,7 @@
RELEASE=$(shell awk '/Release:/ { print $$2 }' ${PKGNAME}.spec)
CVSTAG=yum-$(subst .,_,$(VERSION)-$(RELEASE))
@@ -8,13 +8,12 @@
WEBHOST = yum.baseurl.org
WEB_DOC_PATH = /srv/projects/yum/web/download/docs/yum-api/
-@@ -62,12 +63,12 @@
+@@ -83,11 +83,11 @@
epydoc --check $(DOCS)
test:
- @nosetests -i ".*test" test
+ @$(NOSETESTS) -i ".*test" test
- - at test/check-po-yes-no.py
cd po; make test
test-skipbroken:
diff --git a/pld-release.patch b/pld-release.patch
index 85adc62..41aa2cf 100644
--- a/pld-release.patch
+++ b/pld-release.patch
@@ -1,11 +1,11 @@
---- yum-3.4.3/yum/config.py~ 2013-03-02 21:24:45.000000000 +0200
-+++ yum-3.4.3/yum/config.py 2013-03-03 18:30:14.106276193 +0200
-@@ -612,7 +612,7 @@
- debuglevel = IntOption(2, 0, 10)
+--- yum-3.4.3/yum/config.py~ 2014-06-14 16:51:52.000000000 +0300
++++ yum-3.4.3/yum/config.py 2014-06-14 17:09:54.264341309 +0300
+@@ -719,7 +719,7 @@
+ debuglevel = IntOption(2, -4, 10)
errorlevel = IntOption(2, 0, 10)
-- distroverpkg = Option('redhat-release')
-+ distroverpkg = Option('pld-release')
+- distroverpkg = ListOption(['system-release(releasever)', 'redhat-release'])
++ distroverpkg = ListOption(['system-release(releasever)', 'pld-release'])
installroot = Option('/')
config_file_path = Option('/etc/yum/yum.conf')
plugins = BoolOption(False)
diff --git a/rpm5-yum.patch b/rpm5-yum.patch
index 430f8ec..2ef400c 100644
--- a/rpm5-yum.patch
+++ b/rpm5-yum.patch
@@ -52,52 +52,6 @@ Subject: [PATCH 2/5] If there is no RPMSENSE_PREREQ , just continue on
--
1.8.2.1
-From 01acc94570b866a06de0f143ee8392ca3cfd08aa Mon Sep 17 00:00:00 2001
-From: Nigel Kukard <nkukard at lbsd.net>
-Date: Tue, 1 Feb 2011 07:28:17 +0000
-Subject: [PATCH 3/5] Workaround for the issue of idx.count() vs. for hdr in
- idx
-
----
- yum/config.py | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
-
---- yum-3.4.3/yum/config.py 2013-04-27 18:30:20.430303907 +0300
-+++ yum-rpm5/yum/config.py 2013-04-15 08:46:43.769271228 +0300
-@@ -1166,18 +1015,22 @@
- except rpm.error, e:
- # This is the "new" code for "cannot open rpmdb", 4.8.0 ish
- raise Errors.YumBaseError("Error: " + str(e))
-+
-+ # NK: The previous use if idx.count() did not work, as per rpmmi-py.c
-+ # comments, use 'for hdr in idx' method of gettind hdr instead
-+
-+ # set '$releasever' by default
-+ releasever = '$releasever'
-+
- # we're going to take the first one - if there is more than one of these
- # then the user needs a beating
-- if idx.count() == 0:
-- releasever = None
-- else:
-- try:
-- hdr = idx.next()
-- except StopIteration:
-- raise Errors.YumBaseError("Error: rpmdb failed release provides. Try: rpm --rebuilddb")
-+ for hdr in idx:
- releasever = hdr['version']
-- del hdr
-+ break
-+
-+ # /NK
-+
- del idx
- del ts
- return releasever
-
---
-1.8.2.1
-
From 80e24f1607e19edada799bee1ed609a3b173c288 Mon Sep 17 00:00:00 2001
From: Nigel Kukard <nkukard at lbsd.net>
Date: Tue, 1 Feb 2011 17:55:29 +0000
diff --git a/yum-distro-configs.patch b/yum-distro-configs.patch
index a4608a2..8a89760 100644
--- a/yum-distro-configs.patch
+++ b/yum-distro-configs.patch
@@ -1,7 +1,6 @@
-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 @@
+--- yum-3.4.3/yum/config.py~ 2014-06-14 16:48:14.000000000 +0300
++++ yum-3.4.3/yum/config.py 2014-06-14 16:49:16.527937543 +0300
+@@ -46,10 +46,10 @@
# Alter/patch these to change the default checking...
__pkgs_gpgcheck_default__ = False
__repo_gpgcheck_default__ = False
@@ -13,7 +12,6 @@ diff -ru yum-3.4.3-orig/yum/config.py yum-3.4.3/yum/config.py
+__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~
+ __kernelpkgnames_default__ = ['kernel','kernel-smp', 'kernel-longterm', 'kernel-3.4', 'kernel-3.10']
+ __installonlypkgs_default__ = __kernelpkgnames_default__ + [
+ 'installonlypkg(kernel)', 'installonlypkg(kernel-module)', 'installonlypkg(vm)'
diff --git a/yum-missingok.patch b/yum-missingok.patch
index 35b38ba..8598359 100644
--- a/yum-missingok.patch
+++ b/yum-missingok.patch
@@ -10,8 +10,8 @@
flags = flags & 0xf
if flags == 0: return None
---- yum-3.4.3/yum/packages.py 2013-04-28 12:10:15.669276249 +0300
-+++ yum-3.4.3/yum/packages.py 2013-04-28 12:22:29.169904420 +0300
+--- yum-3.4.3/yum/packages.py~ 2014-06-14 17:29:50.000000000 +0300
++++ yum-3.4.3/yum/packages.py 2014-06-14 17:34:50.475763987 +0300
@@ -1257,6 +1257,9 @@
continue
prcostring = ''' <rpm:entry name="%s"''' % misc.to_xml(name, attrib=True)
@@ -22,23 +22,22 @@
prcostring += ''' flags="%s"''' % misc.to_xml(flags, attrib=True)
if e:
prcostring += ''' epoch="%s"''' % misc.to_xml(e, attrib=True)
-@@ -1422,6 +1425,7 @@
- # installed. So we need to mark those deps. as "weak".
+@@ -1464,14 +1464,18 @@
+ # This is not the same as recommends/weak_requires.
bits = rpm.RPMSENSE_SCRIPT_PRE | rpm.RPMSENSE_SCRIPT_POST
weakreqs = [bool(flag & bits) for flag in lst]
+ suggests = [bool(flag & rpm.RPMSENSE_MISSINGOK) for flag in lst]
- flag = map(rpmUtils.miscutils.flagToString, lst)
- flag = map(misc.share_data, flag)
-@@ -1434,8 +1438,11 @@
- self.prco[prcotype] = map(misc.share_data, zip(name,flag,vers))
+ vers = hdr[getattr(rpm, 'RPMTAG_%sVERSION' % tag)]
+ prcotype = tag2prco[tag]
+ self.prco[prcotype] = _end_nfv(name, lst, vers)
if tag == 'REQUIRE':
weakreqs = zip(weakreqs, self.prco[prcotype])
+ suggests = zip(suggests, self.prco[prcotype])
strongreqs = [wreq[1] for wreq in weakreqs if not wreq[0]]
-+ strongreqs = [wreq[1] for wreq in suggests if not wreq[0]]
++ suggestreqs = [wreq[1] for wreq in suggests if not wreq[0]]
self.prco['strong_requires'] = strongreqs
-+ self.prco['suggests'] = suggests
-
- def tagByName(self, tag):
- warnings.warn("tagByName() will go away in a furture version of Yum.\n",
++ self.prco['suggests'] = suggestreqs
+
+ # This looks horrific as we are supporting both the old and new formats:
+ tag2prco = { "SUGGEST": ( misc.share_data("suggests"),
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/yum.git/commitdiff/924160069063423c0b7827d21999e31da832d0f2
More information about the pld-cvs-commit
mailing list