Hello community, here is the log from the commit of package smart checked in at Sat Jun 3 11:38:22 CEST 2006. -------- --- smart/smart.changes 2006-04-26 19:58:14.000000000 +0200 +++ smart/smart.changes 2006-06-03 01:11:23.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Jun 3 01:03:53 CEST 2006 - cthiel@suse.de + +- updated smart-trunk.diff (r704) +- updated smart-YaST2.diff (r704) +- added 4 patches from Pascal Bleser: + * smart-channel-mirrors.diff + * smart-mirror-workaround.diff + * smart-fix-obsoleteversion-type-error.diff + * smart-fix-search-with-empty-description.diff +- added smart-ksmarttray.desktop + +------------------------------------------------------------------- New: ---- smart-channel-mirrors.diff smart-fix-obsoleteversion-type-error.diff smart-fix-search-with-empty-description.diff smart-ksmarttray.desktop smart-mirror-workaround.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smart.spec ++++++ --- /var/tmp/diff_new_pack.ELi9ki/_old 2006-06-03 11:37:56.000000000 +0200 +++ /var/tmp/diff_new_pack.ELi9ki/_new 2006-06-03 11:37:56.000000000 +0200 @@ -14,14 +14,19 @@ BuildRequires: kdelibs3-devel python-devel python-elementtree python-gtk rpm-devel rpm-python update-desktop-files Summary: Smart Package Manager Version: 0.41 -Release: 23 +Release: 24 Source: %{name}-%{version}.tar.bz2 Source1: distro.py Source2: %{name}.desktop +Source3: %{name}-ksmarttray.desktop Patch: %{name}-%{version}.diff Patch1: %{name}-YaST2.diff -Patch2: smart-ksmarttray-guard.diff -Patch3: smart-trunk.diff +Patch2: %{name}-trunk.diff +Patch3: %{name}-ksmarttray-guard.diff +Patch4: %{name}-channel-mirrors.diff +Patch5: %{name}-mirror-workaround.diff +Patch6: %{name}-fix-obsoleteversion-type-error.diff +Patch7: %{name}-fix-search-with-empty-description.diff URL: http://smartpm.org Group: System/Packages License: GPL @@ -47,7 +52,7 @@ %package gui Summary: Graphical User Interface for smart Group: System/Packages -Requires: smart = %{version} +Requires: %{name} = %{version} Requires: python-gtk %description gui @@ -62,8 +67,8 @@ %package ksmarttray Summary: KDE System Tray for the Smart Package Manager Group: System/Packages -Requires: smart = %{version} -Requires: smart-gui = %{version} +Requires: %{name} = %{version} +Requires: %{name}-gui = %{version} %description ksmarttray KDE System Tray for the Smart Package Manager. @@ -80,6 +85,10 @@ %patch1 %patch2 %patch3 +%patch4 +%patch5 +%patch6 +%patch7 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -103,6 +112,7 @@ %{__install} -m 0755 -D contrib/smart-update/smart-update \ $RPM_BUILD_ROOT%{_sbindir}/smart-update %{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop +%{__install} -m 0644 -D %{SOURCE3} $RPM_BUILD_ROOT/usr/share/applications/%{name}-ksmarttray.desktop %{__install} -m 0644 -D smart/interfaces/images/smart.png $RPM_BUILD_ROOT/usr/share/pixmaps/smart.png pushd contrib/rpmhelper python ./setup.py install --prefix=%{_prefix} --root="$RPM_BUILD_ROOT" @@ -120,7 +130,8 @@ pushd contrib/ksmarttray %{makeinstall} popd -%suse_update_desktop_file %name Application System Utility Settings PackageManager +%suse_update_desktop_file %name System PackageManager +%suse_update_desktop_file %name-ksmarttray System PackageManager %find_lang %name %clean @@ -144,7 +155,7 @@ %files gui %defattr(-,root,root) %{py_sitedir}/smart/interfaces/gtk -%{_datadir}/applications/smart.desktop +%{_datadir}/applications/smart*.desktop %{_datadir}/pixmaps/smart.png %files ksmarttray @@ -155,6 +166,15 @@ /opt/kde3/share/apps/konqueror %changelog -n smart +* Sat Jun 03 2006 - cthiel@suse.de +- updated smart-trunk.diff (r704) +- updated smart-YaST2.diff (r704) +- added 4 patches from Pascal Bleser: + * smart-channel-mirrors.diff + * smart-mirror-workaround.diff + * smart-fix-obsoleteversion-type-error.diff + * smart-fix-search-with-empty-description.diff +- added smart-ksmarttray.desktop * Wed Apr 26 2006 - cthiel@suse.de - new subpackage ksmarttray - included KDE service menus ++++++ distro.py ++++++ --- smart/distro.py 2006-03-04 13:37:08.000000000 +0100 +++ smart/distro.py 2006-06-03 01:12:45.000000000 +0200 @@ -12,3 +12,6 @@ "kernel-syms","kernel-um","kernel-xen"]: kernel = "kernel-%s" % type pkgconf.setFlag("multi-version", kernel) + + pkgconf.setFlag("multi-version", "java") + \ No newline at end of file ++++++ smart-0.41.diff ++++++ --- /var/tmp/diff_new_pack.ELi9ki/_old 2006-06-03 11:37:56.000000000 +0200 +++ /var/tmp/diff_new_pack.ELi9ki/_new 2006-06-03 11:37:56.000000000 +0200 @@ -32,20 +32,6 @@ ], data_files = I18NFILES + [(PYTHONLIB+"/smart/interfaces/images", ---- smart/__init__.py -+++ smart/__init__.py -@@ -52,7 +52,10 @@ - else: - import codecs - try: -- encoding = locale.getpreferredencoding() -+ try: -+ encoding = locale.getpreferredencoding() -+ except locale.Error: -+ encoding = "C" - sys.stdout = codecs.getwriter(encoding)(sys.stdout) - sys.stderr = codecs.getwriter(encoding)(sys.stderr) - del encoding --- smart/backends/deb/loader.py +++ smart/backends/deb/loader.py @@ -33,7 +33,10 @@ ++++++ smart-YaST2.diff ++++++ --- /var/tmp/diff_new_pack.ELi9ki/_old 2006-06-03 11:37:56.000000000 +0200 +++ /var/tmp/diff_new_pack.ELi9ki/_new 2006-06-03 11:37:56.000000000 +0200 @@ -1,5 +1,7 @@ ---- smart/channels/yast2.py -+++ smart/channels/yast2.py +Index: smart/channels/yast2.py +=================================================================== +--- smart/channels/yast2.py (.../tags/0.41) (Revision 0) ++++ smart/channels/yast2.py (.../branches/yast2-channel) (Revision 704) @@ -0,0 +1,119 @@ +# +# Copyright (c) 2004 Conectiva, Inc. @@ -120,8 +122,10 @@ + data["priority"]) + +# vim:ts=4:sw=4:et ---- smart/channels/yast2_info.py -+++ smart/channels/yast2_info.py +Index: smart/channels/yast2_info.py +=================================================================== +--- smart/channels/yast2_info.py (.../tags/0.41) (Revision 0) ++++ smart/channels/yast2_info.py (.../branches/yast2-channel) (Revision 704) @@ -0,0 +1,35 @@ +# +# Copyright (c) 2004 Conectiva, Inc. @@ -158,9 +162,11 @@ + _("Base URL of YaST2 repository, where directory.yast is located.")), + ("medias", _("Medias"), str, "", + _("Space separated list of medias. (NOT IN USE YET)"))] ---- smart/backends/rpm/yast2.py -+++ smart/backends/rpm/yast2.py -@@ -0,0 +1,299 @@ +Index: smart/backends/rpm/yast2.py +=================================================================== +--- smart/backends/rpm/yast2.py (.../tags/0.41) (Revision 0) ++++ smart/backends/rpm/yast2.py (.../branches/yast2-channel) (Revision 704) +@@ -0,0 +1,292 @@ +# +# Copyright (c) 2004 Conectiva, Inc. +# @@ -280,8 +286,6 @@ + self._descfile.seek((self._pkgoffsets[entryname] + 1)) + summary = self._descfile.readline()[5:-1] + description = "" -+ # WARNING - this could cause an infinite loop! -+ # We need to find a better way to do it! + while 1: + line = self._descfile.readline() + if line.startswith("+Des:") or line.startswith("<!--"): continue @@ -308,7 +312,7 @@ + + # avoid parsing errors on undefined fields + requires = prequire = conflicts = obsoletes = [] -+ group = summary = description = size = "" ++ group = summary = description = size = instsize = filename = media = "" + + for line in self._pkgentry: + kw = line[:4] @@ -346,11 +350,8 @@ + group = line[6:] + elif kw == "=Shr": + shares = line[6:].split() -+ #import sys -+ #print name + " " + arch + " -> +Shr: " + line[6:] + for pkgshr in self._packages: + shrver, shrarch = splitarch(pkgshr.version) -+ #print shrver + " " + shrarch + " / " + shares[1]+"-"+shares[2] + " " + shares[3] + if shrver == (shares[1]+"-"+shares[2]) and shrarch == shares[3]: + shrinfo = self.getInfo(pkgshr) + summary = shrinfo.getSummary() @@ -419,8 +420,6 @@ + self._descfile = open(self._pkgdescfile) + # populate pointers for lines that matches packages on description file + self._pkgoffsets = {} -+ # WARNING - this could cause an infinite loop! -+ # We need to find a better way to do it! + while 1: + line = self._descfile.readline() + if not line: break ++++++ smart-channel-mirrors.diff ++++++ --- smart/channel.py.orig 2006-05-20 15:52:54.000000000 +0200 +++ smart/channel.py 2006-05-20 15:53:14.000000000 +0200 @@ -155,6 +155,10 @@ def createChannel(alias, data): data = parseChannelData(data) + if 'mirrors' in data: + mirrors = data.get('mirrors') + else: + mirrors = [] type = data.get("type", "").replace('-', '_').lower() try: smart = __import__("smart.channels."+type) @@ -173,7 +177,13 @@ continue if key not in data: data[key] = default - return channel.create(alias, data) + c = channel.create(alias, data) + for mirror in mirrors: + if 'baseurl' in data: + sysconf.add(("mirrors", data['baseurl']), mirror, unique=True) + else: + print "Warning: channel '%s' has no attribute 'baseurl'" % alias + return c def createChannelDescription(alias, data): ctype = data.get("type") @@ -205,6 +215,11 @@ ctype = data.get("type") if not ctype: raise Error, _("Channel has no type") + if 'mirrors' in data: + mirrors = data.get('mirrors') + del data['mirrors'] + else: + mirrors = [] info = getChannelInfo(ctype) if not info: raise Error, _("Unknown channel type: %s") % ctype @@ -246,6 +261,8 @@ newdata[key] = value if hasattr(info, "postParse"): newdata = info.postParse(newdata) + if mirrors != None: + newdata['mirrors'] = mirrors return newdata def parseChannelsDescription(data): @@ -264,7 +281,15 @@ channels[alias] = current elif current is not None and not line[0] == "#" and "=" in line: key, value = line.split("=") - current[key.strip().lower()] = value.strip() + if key.strip() == "mirror": + if 'baseurl' in current: + if not ('mirrors' in current): + current['mirrors'] = [] + current['mirrors'].append(value.strip()) + else: + raise Error, _("mirror comes before baseurl in channel %s") % alias + else: + current[key.strip().lower()] = value.strip() for alias in channels: channels[alias] = parseChannelData(channels[alias]) return channels ++++++ smart-fix-obsoleteversion-type-error.diff ++++++ --- smart/backends/rpm/header.py.orig 2006-05-01 00:37:46.000000000 +0200 +++ smart/backends/rpm/header.py 2006-05-01 00:38:57.000000000 +0200 @@ -280,7 +280,11 @@ v = h[1115] # RPMTAG_OBSOLETEVERSION upgargs = [] for i in range(len(n)): - vi = v[i] or None + try: + vi = v[i] or None + except TypeError: + vi = None + pass if vi and vi[:2] == "0:": vi = vi[2:] if i == 0 and type(f) != list: ++++++ smart-fix-search-with-empty-description.diff ++++++ --- smart/commands/query.py +++ smart/commands/query.py @@ -280,7 +280,8 @@ newpackages[pkg] = True if hasdescription: for pattern in hasdescription: - if pattern.search(info.getDescription()): + d = info.getDescription() + if d != None and len(d) > 0 and pattern.search(info.getDescription()): newpackages[pkg] = True if haspath: for pattern in haspath: ++++++ smart-mirror-workaround.diff ++++++ --- smart/mirror.py.orig 2006-05-23 00:22:55.000000000 +0200 +++ smart/mirror.py 2006-05-23 00:27:29.000000000 +0200 @@ -149,7 +149,7 @@ self._current = None def addInfo(self, **info): - if self._current: + if self._current and hasattr(self._current, 'mirror'): self._system.addInfo(self._current.mirror, **info) def getNext(self): ++++++ smart-trunk.diff ++++++ ++++ 37376 lines (skipped) ++++ between smart/smart-trunk.diff ++++ and smart/smart-trunk.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org