Hello community, here is the log from the commit of package smart checked in at Thu Dec 7 21:28:00 CET 2006. -------- --- smart/smart.changes 2006-10-23 23:21:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/smart/smart.changes 2006-12-04 16:47:29.000000000 +0100 @@ -1,0 +2,55 @@ +Mon Dec 4 16:48:31 CET 2006 - cthiel@suse.de + +- updated smart-channel-mirrors.patch + +------------------------------------------------------------------- +Sun Dec 3 17:37:50 CET 2006 - cthiel@suse.de + +- updated smart-trunk.patch to r833 + +------------------------------------------------------------------- +Fri Nov 17 11:27:52 CET 2006 - cthiel@suse.de + +- updated smart-channel-mirrors.patch (from Pascal Bleser) + +------------------------------------------------------------------- +Wed Nov 15 13:02:17 CET 2006 - cthiel@suse.de + +- updated smart-trunk.patch to r812 +- remove smart-cElementTree.patch, got applied upstream + +------------------------------------------------------------------- +Sun Nov 12 18:54:41 CET 2006 - cthiel@suse.de + +- removed smart-python25.patch, updated smart-cElementTree.patch + +------------------------------------------------------------------- +Sun Nov 12 17:23:27 CET 2006 - cthiel@suse.de + +- readded smart-trunk.patch to track trunk again + * diff from r796 (0.50rc1) to r810 + +------------------------------------------------------------------- +Wed Nov 8 18:23:32 CET 2006 - cthiel@suse.de + +- readded some parts of smart-python25.patch, to fix smart on 10.2+ + +------------------------------------------------------------------- +Tue Nov 7 15:24:19 CET 2006 - cthiel@suse.de + +- update to 0.50rc1 + * obsoltes smart-0.42-pycurl.patch, smart-0.42-pycurl-TIMECONDITION.patch, + smart-python25.patch, smart-rpm-force.patch, smart-yast-del.patch and + smart-yast.patch + * includes improved transaction algorithm which makes it able to survive + massive whole-distribution upgrades with good results + * changes the way that priorities are considered by the transaction + mechanism, so that tracking individual packages from arbitrary + repositories is actually much more predictable and manageable. + * implementes ETA reporting during downloads for graphic and textual + interfaces. + * numerous bugfixes +- reenable smart-channel-mirrors.patch, pulled in latests version from + Pascal Bleser + +------------------------------------------------------------------- Old: ---- smart-0.42-pycurl-TIMECONDITION.patch smart-0.42-pycurl.patch smart-0.42.tar.bz2 smart-cElementTree.patch smart-python25.patch smart-rpm-force.patch smart-yast-del.patch smart-yast.patch New: ---- smart-0.50rc1.tar.bz2 smart-trunk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smart.spec ++++++ --- /var/tmp/diff_new_pack.HvXgKV/_old 2006-12-07 21:27:11.000000000 +0100 +++ /var/tmp/diff_new_pack.HvXgKV/_new 2006-12-07 21:27:11.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package smart (Version 0.42) +# spec file for package smart (Version 0.49.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,32 +11,29 @@ # norootforbuild Name: smart -BuildRequires: kdelibs3-devel python-devel rpm-python update-desktop-files +BuildRequires: kdelibs3-devel python-devel python-xml rpm-python update-desktop-files %if %{suse_version} < 1010 BuildRequires: rpm-devel %endif +%if %{suse_version} <= 1010 +BuildRequires: python-elementtree +%endif Summary: Smart Package Manager -Version: 0.42 -Release: 28 -Source: %{name}-%{version}.tar.bz2 +Version: 0.49.1 +Release: 1 +Source: smart-0.50rc1.tar.bz2 Source1: distro.py Source2: %{name}.desktop Source3: %{name}-ksmarttray.desktop -Patch: %{name}-cElementTree.patch Patch1: %{name}-channel-mirrors.patch Patch2: %{name}-rpm-check-signatures.patch Patch3: %{name}-ksmarttray-runsmart.patch Patch4: %{name}-ksmarttray.patch -Patch5: %{name}-%{version}-pycurl.patch -Patch6: %{name}-%{version}-pycurl-TIMECONDITION.patch -Patch7: %{name}-yast.patch -Patch8: %{name}-rpm-force.patch -Patch9: %{name}-yast-del.patch -Patch10: %{name}-yast-media.patch -Patch11: %{name}-python25.patch +Patch5: %{name}-yast-media.patch +Patch99: %{name}-trunk.patch URL: http://smartpm.org Group: System/Packages -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{suse_version} <= 1010 Requires: python-elementtree @@ -90,26 +87,16 @@ Gustavo Niemeyer <gustavo@niemeyer.net> %prep -%setup -q -%patch -# disable smart-channel-mirrors.patch, as it seems to break smart's caching -# behavior -# %patch1 +%setup -q -n %name-0.50rc1 +%patch1 %patch2 %patch3 %patch4 %patch5 -%patch6 -%patch7 -%patch8 -%patch9 -%patch10 -%if %{suse_version} > 1010 -%patch11 -%endif %if %{suse_version} < 1010 echo ' sysconf.set("no-rpm-readHeaderFromFD", 3)' >> %{SOURCE1} %endif +%patch99 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -204,6 +191,37 @@ /opt/kde3/share/apps/konqueror %changelog -n smart +* Mon Dec 04 2006 - cthiel@suse.de +- updated smart-channel-mirrors.patch +* Sun Dec 03 2006 - cthiel@suse.de +- updated smart-trunk.patch to r833 +* Fri Nov 17 2006 - cthiel@suse.de +- updated smart-channel-mirrors.patch (from Pascal Bleser) +* Wed Nov 15 2006 - cthiel@suse.de +- updated smart-trunk.patch to r812 +- remove smart-cElementTree.patch, got applied upstream +* Sun Nov 12 2006 - cthiel@suse.de +- removed smart-python25.patch, updated smart-cElementTree.patch +* Sun Nov 12 2006 - cthiel@suse.de +- readded smart-trunk.patch to track trunk again + * diff from r796 (0.50rc1) to r810 +* Wed Nov 08 2006 - cthiel@suse.de +- readded some parts of smart-python25.patch, to fix smart on 10.2+ +* Tue Nov 07 2006 - cthiel@suse.de +- update to 0.50rc1 + * obsoltes smart-0.42-pycurl.patch, smart-0.42-pycurl-TIMECONDITION.patch, + smart-python25.patch, smart-rpm-force.patch, smart-yast-del.patch and + smart-yast.patch + * includes improved transaction algorithm which makes it able to survive + massive whole-distribution upgrades with good results + * changes the way that priorities are considered by the transaction + mechanism, so that tracking individual packages from arbitrary + repositories is actually much more predictable and manageable. + * implementes ETA reporting during downloads for graphic and textual + interfaces. + * numerous bugfixes +- reenable smart-channel-mirrors.patch, pulled in latests version from + Pascal Bleser * Mon Oct 23 2006 - cthiel@suse.de - fix distro.py * Sat Oct 21 2006 - cthiel@suse.de ++++++ smart-channel-mirrors.patch ++++++ --- /var/tmp/diff_new_pack.HvXgKV/_old 2006-12-07 21:27:11.000000000 +0100 +++ /var/tmp/diff_new_pack.HvXgKV/_new 2006-12-07 21:27:11.000000000 +0100 @@ -1,66 +1,44 @@ ---- 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 @@ +--- smart/channel.py.orig 2006-11-19 22:22:09.000000000 +0100 ++++ smart/channel.py 2006-11-19 22:26:06.000000000 +0100 +@@ -173,7 +173,17 @@ 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 ++ if "mirrors" in data: ++ for mirror in data.get("mirrors"): ++ if 'baseurl' in data: ++ from smart.const import DEBUG ++ if sysconf.get("log-level") == DEBUG: ++ print "Adding mirror "%s" for "%s"" % (mirror, data["baseurl"]) ++ 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 +@@ -211,6 +221,8 @@ + if hasattr(info, "preParse"): + data = info.preParse(data) + newdata = {} ++ if data and data.has_key("mirrors"): ++ newdata["mirrors"] = data["mirrors"] + for key, label, ftype, default, descr in info.fields: + if key == "alias": + continue +@@ -265,8 +277,13 @@ 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() + current[key.strip().lower()] = value.strip() ++ mirrorsHaven = None ++ if current and current.has_key("mirrors"): ++ mirrorsHaven = current["mirrors"] for alias in channels: channels[alias] = parseChannelData(channels[alias]) ++ if alias and mirrorsHaven: ++ channels[alias]["mirrors"] = mirrorsHaven return channels + + def getChannelInfo(type): ++++++ smart-trunk.patch ++++++ ++++ 49568 lines (skipped) ++++++ smart-yast-media.patch ++++++ --- /var/tmp/diff_new_pack.HvXgKV/_old 2006-12-07 21:27:12.000000000 +0100 +++ /var/tmp/diff_new_pack.HvXgKV/_new 2006-12-07 21:27:12.000000000 +0100 @@ -9,7 +9,7 @@ + # replace last digit with media number as yast does + u = self._loader._baseurl.rstrip("/"); + if u[len(u)-1:] == '1': -+ u = u.rstrip("1234567890") ++ u = u.rstrip("1") + u += self._info.get("media") + + return [posixpath.join(u, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org