[packages/yum] drop Suggests packages from repodata output (_dump_requires)

[glen]

commit 83f456dd1587423ae12345aaf03084f8a63d2ad1
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Apr 28 13:06:13 2013 +0300

    drop Suggests packages from repodata output (_dump_requires)

 yum-missingok.patch | 20 +++++++++++++++-----
 yum.spec            | 10 ++++++----
 2 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/yum.spec b/yum.spec
index 036b9ff..db100a5 100644
--- a/yum.spec
+++ b/yum.spec
@@ -4,11 +4,12 @@
 
 # TODO
 # - PLDize (or drop) /etc/yum/version-groups.conf
+%define	rpm_ver 5.4.10-50
 Summary:	RPM installer/updater
 Summary(pl.UTF-8):	Narzędzie do instalowania/uaktualniania pakietów RPM
 Name:		yum
 Version:	3.4.3
-Release:	6
+Release:	7
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@ -42,7 +43,7 @@ URL:		http://yum.baseurl.org/
 BuildRequires:	bash-completion >= 2.0
 BuildRequires:	gettext-devel
 BuildRequires:	intltool
-BuildRequires:	python-rpm
+BuildRequires:	python-rpm >= %{rpm_ver}
 BuildRequires:	python-urlgrabber
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.228
@@ -58,10 +59,11 @@ Requires:	python >= 1:2.5
 Requires:	python-iniparse
 Requires:	python-libxml2
 Requires:	python-pygpgme
-Requires:	python-rpm >= 5.4.10-50
+Requires:	python-rpm >=  %{rpm_ver}
+Requires:	rpm >= %{rpm_ver}
 Requires:	python-sqlite
 Requires:	python-urlgrabber >= 1:3.9.1
-Requires:	rpm >= 4.5
+Requires:	rpm >= %{rpm_ver}
 Requires:	yum-metadata-parser >= 1.1.4
 Obsoletes:	yum-plugin-security < 1.1.32
 BuildArch:	noarch
diff --git a/yum-missingok.patch b/yum-missingok.patch
index 6407137..35b38ba 100644
--- a/yum-missingok.patch
+++ b/yum-missingok.patch
@@ -10,17 +10,27 @@
      flags = flags & 0xf
  
      if flags == 0: return None
---- yum-3.4.3/yum/packages.py	2013-04-27 22:39:39.544678577 +0300
-+++ yum-3.4.3/yum/packages.py	2013-04-27 22:33:23.000000000 +0300
-@@ -1418,6 +1419,7 @@
+--- 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
+@@ -1257,6 +1257,9 @@
+                         continue
+             prcostring = '''      <rpm:entry name="%s"''' % misc.to_xml(name, attrib=True)
+             if flags:
++                # skip suggests
++                if flags[0] == 'MISSINGOK':
++                    continue
+                 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".
                  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]
++                suggests = [bool(flag & rpm.RPMSENSE_MISSINGOK) for flag in lst]
              flag = map(rpmUtils.miscutils.flagToString, lst)
              flag = map(misc.share_data, flag)
  
-@@ -1430,8 +1432,11 @@
+@@ -1434,8 +1438,11 @@
              self.prco[prcotype] = map(misc.share_data, zip(name,flag,vers))
              if tag == 'REQUIRE':
                  weakreqs = zip(weakreqs, self.prco[prcotype])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/yum.git/commitdiff/83f456dd1587423ae12345aaf03084f8a63d2ad1