Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
OBS:Server:2.5
yum
project.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File project.diff of Package yum
--- yum-3.4.3-suse-missing-tags.patch.orig +++ yum-3.4.3-suse-missing-tags.patch @@ -1,5 +1,7 @@ ---- ./yum/mdparser.py.orig 2014-02-25 11:04:36.905061790 +0000 -+++ ./yum/mdparser.py 2014-02-25 11:04:45.009061775 +0000 +Index: yum/mdparser.py +=================================================================== +--- yum/mdparser.py.orig ++++ yum/mdparser.py @@ -155,7 +155,8 @@ class PrimaryEntry(BaseEntry): p[name] = child.text @@ -10,9 +12,19 @@ self.prco[name] = self.getPrco(child) elif name == 'header-range': ---- ./yum/packages.py.orig 2014-02-25 11:04:36.910061790 +0000 -+++ ./yum/packages.py 2014-02-25 12:31:03.379052610 +0000 -@@ -54,6 +54,14 @@ except ImportError: +Index: yum/packages.py +=================================================================== +--- yum/packages.py.orig ++++ yum/packages.py +@@ -28,6 +28,7 @@ import re + import fnmatch + import stat + import warnings ++import collections + from subprocess import Popen, PIPE + from rpmUtils import RpmUtilsError + import rpmUtils.miscutils +@@ -54,6 +55,14 @@ except ImportError: import pwd import grp @@ -27,7 +39,7 @@ def comparePoEVR(po1, po2): """ Compare two Package or PackageEVR objects. -@@ -412,6 +420,10 @@ class RpmBase(object): +@@ -412,6 +421,10 @@ class RpmBase(object): self.prco['conflicts'] = [] # (name, flag, (e,v,r)) self.prco['requires'] = [] # (name, flag, (e,v,r)) self.prco['provides'] = [] # (name, flag, (e,v,r)) @@ -38,7 +50,7 @@ self.files = {} self.files['file'] = [] self.files['dir'] = [] -@@ -615,6 +627,10 @@ class RpmBase(object): +@@ -615,6 +628,10 @@ class RpmBase(object): provides = property(fget=lambda self: self.returnPrco('provides')) obsoletes = property(fget=lambda self: self.returnPrco('obsoletes')) conflicts = property(fget=lambda self: self.returnPrco('conflicts')) @@ -49,7 +61,7 @@ provides_names = property(fget=lambda self: self.returnPrcoNames('provides')) requires_names = property(fget=lambda self: self.returnPrcoNames('requires')) conflicts_names = property(fget=lambda self: self.returnPrcoNames('conflicts')) -@@ -1122,6 +1138,10 @@ class YumAvailablePackage(PackageObject, +@@ -1122,6 +1139,10 @@ class YumAvailablePackage(PackageObject, msg += self._dump_requires() msg += self._dump_pco('conflicts') msg += self._dump_pco('obsoletes') @@ -60,7 +72,7 @@ msg += self._dump_files(True) if msg[-1] != '\n': msg += """\n""" -@@ -1358,6 +1378,17 @@ class YumHeaderPackage(YumAvailablePacka +@@ -1358,6 +1379,22 @@ class YumHeaderPackage(YumAvailablePacka def _get_hdr(self): return self.hdr @@ -68,6 +80,11 @@ + newname = [] + newflag = [] + newvers = [] ++ # backward compatibility fix for SLE 11: flag might be an int ++ # instead of a list, if there is exactly one entry for the ++ # corresponding tag ++ if not isinstance(flag, collections.Iterable): ++ flag = [flag] + for (n, f, v) in zip(name, flag, vers): + if f & andmask == resmask: + newname.append(n) @@ -78,7 +95,7 @@ def _populatePrco(self): "Populate the package object with the needed PRCO interface." -@@ -1383,6 +1414,33 @@ class YumHeaderPackage(YumAvailablePacka +@@ -1383,6 +1420,33 @@ class YumHeaderPackage(YumAvailablePacka prcotype = tag2prco[tag] self.prco[prcotype] = map(misc.share_data, zip(name,flag,vers)) @@ -112,8 +129,10 @@ def tagByName(self, tag): warnings.warn("tagByName() will go away in a furture version of Yum.\n", ---- ./yum/sqlitesack.py.orig 2014-02-25 11:04:36.922061790 +0000 -+++ ./yum/sqlitesack.py 2014-02-25 12:22:10.025053554 +0000 +Index: yum/sqlitesack.py +=================================================================== +--- yum/sqlitesack.py.orig ++++ yum/sqlitesack.py @@ -179,7 +179,11 @@ class YumAvailablePackageSqlite(YumAvail self.prco = { 'obsoletes': (), 'conflicts': (), --- yum.changes.orig +++ yum.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sun May 4 09:08:16 UTC 2014 - suse-tux@gmx.de + +- added SLE 11 backward compatibility fix to the suse-missing-tags + patch + +------------------------------------------------------------------- Mon Feb 24 18:53:37 UTC 2014 - suse-tux@gmx.de - minor change to the suse-missing-tags patch in order to fix bnc#841280 --- yum.spec.orig +++ yum.spec @@ -80,6 +80,7 @@ Summary: YUM update notification Group: Development/Languages/Python Requires: dbus-1-python Requires: python-gobject2 +PreReq: %insserv_prereq Requires: python-urlgrabber Requires: python-urlgrabber Requires: yum-metadata-parser >= 1.1.0 @@ -215,6 +216,12 @@ fi %{_datadir}/yum-cli %{_bindir}/* %exclude %{_mandir}/man*/yum-updatesd* +%if 0%{?suse_version} > 1230 +%dir /usr/share/locale/id_ID +%dir /usr/share/locale/id_ID/LC_MESSAGES +%dir /usr/share/locale/lt_LT +%dir /usr/share/locale/lt_LT/LC_MESSAGES +%endif %files lang -f %name.lang %defattr(-,root,root)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor