Hello community,
here is the log from the commit of package yum for openSUSE:Factory
checked in at Fri Apr 16 02:04:37 CEST 2010.
--------
--- yum/yum.changes 2010-03-31 13:50:56.000000000 +0200
+++ /mounts/work_src_done/STABLE/yum/yum.changes 2010-04-12 12:43:18.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Apr 12 10:37:57 UTC 2010 - mbarringer@novell.com
+
+- Porting patches over from createrepo-0.4:
+ - EULA support (<license-to-confirm>)
+ - SUSE changelog support
+ - Adds suggests, recommends, supplements, and recommends tags
+ - Disables an annoying thing where yum dumps the contents
+ of a node to the terminal when the contents are not utf-8
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
yum-3.2.25-disable-annoying-debug-info.patch
yum-3.2.25-license-to-confirm.patch
yum-3.2.25-suse-changelogs.patch
yum-3.2.25-suse-missing-tags.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yum.spec ++++++
--- /var/tmp/diff_new_pack.FSljfc/_old 2010-04-16 02:04:04.000000000 +0200
+++ /var/tmp/diff_new_pack.FSljfc/_new 2010-04-16 02:04:04.000000000 +0200
@@ -21,7 +21,7 @@
Name: yum
BuildRequires: dbus-1 intltool python-devel
Version: 3.2.25
-Release: 1
+Release: 2
Summary: RPM installer/updater
Group: System/Packages
License: GPLv2+
@@ -30,6 +30,10 @@
Source1: %{name}.conf
Source2: %{name}-updatesd.init
Patch0: %{name}-3.2.6-epoch_workaround.patch
+Patch1: yum-3.2.25-license-to-confirm.patch
+Patch2: yum-3.2.25-suse-changelogs.patch
+Patch3: yum-3.2.25-suse-missing-tags.patch
+Patch4: yum-3.2.25-disable-annoying-debug-info.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: rpm >= 4.4.0
Requires: rpm-python
@@ -94,6 +98,11 @@
%prep
%setup -q
%patch0
+%patch1
+%patch2
+%patch3
+%patch4
+
%ifnarch %{ix86}
for i in rpmUtils yum
do
++++++ yum-3.2.25-disable-annoying-debug-info.patch ++++++
--- yum/misc.py.orig 2010-04-12 12:28:21.000000000 +0200
+++ yum/misc.py 2010-04-12 12:28:35.000000000 +0200
@@ -761,8 +761,8 @@
else:
if x.encode(enc) == item:
- if enc != 'utf-8':
- print '\n%s encoding on %s\n' % (enc, item)
+# if enc != 'utf-8':
+# print '\n%s encoding on %s\n' % (enc, item)
return x.encode('utf-8')
++++++ yum-3.2.25-license-to-confirm.patch ++++++
--- yum/packages.py.orig 2010-04-09 12:26:43.000000000 +0200
+++ yum/packages.py 2010-04-09 13:24:51.000000000 +0200
@@ -34,6 +34,8 @@
import Errors
import errno
import struct
+import glob
+
from constants import *
import urlparse
@@ -1015,6 +1017,23 @@
def xml_dump_primary_metadata(self):
msg = """\n<package type="rpm">"""
msg += misc.to_unicode(self._dump_base_items())
+ eulas = glob.glob("%s.eula.*" % self.localPkg())
+ if eulas is not None:
+ for eula in eulas:
+ match = re.match("(.*eula)\.(.*)", eula)
+ lang = match.group(2)
+
+ eulaContent = None
+
+ try:
+ fd = open(eula, "r")
+ eulaContent = fd.read()
+ fd.close()
+ except IOError:
+ raise MDError, "Failed read contents of %s" % eula
+
+ if eulaContent is not None:
+ msg += """