Hello community, here is the log from the commit of package smart checked in at Thu Sep 20 01:56:43 CEST 2007. -------- --- smart/smart.changes 2007-09-06 14:31:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/smart/smart.changes 2007-09-18 11:32:05.648320000 +0200 @@ -1,0 +2,11 @@ +Tue Sep 18 11:31:42 CEST 2007 - cthiel@suse.de + +- updated default channels to include openSUSE 10.3 + +------------------------------------------------------------------- +Tue Sep 18 10:49:47 CEST 2007 - cthiel@suse.de + +- added "compressed" option to yast2 channels (defaults to packages.gz, but + autodetects legacy packages metadata) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smart.spec ++++++ --- /var/tmp/diff_new_pack.w27690/_old 2007-09-20 01:56:37.000000000 +0200 +++ /var/tmp/diff_new_pack.w27690/_new 2007-09-20 01:56:37.000000000 +0200 @@ -20,7 +20,7 @@ %endif Summary: Smart Package Manager Version: 0.51 -Release: 45 +Release: 53 Source: %{name}-%{version}.tar.bz2 Source1: distro.py Source2: %{name}.desktop @@ -39,7 +39,7 @@ Patch102: %{name}-broken-repo-without-summary-or-description-workaround.diff Patch103: %{name}-channelsync.patch Patch999: %{name}-trunk.patch -URL: http://smartpm.org +Url: http://smartpm.org Group: System/Packages License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,7 +48,6 @@ %endif Requires: python-xml Requires: rpm-python - %py_requires %description @@ -151,11 +150,11 @@ $RPM_BUILD_ROOT%{_prefix}/lib/smart/plugins \ $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels %{__install} -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_prefix}/lib/smart/distro.py -%if %{suse_version} >= 1000 && %{suse_version} < 1030 && %sles_version == 0 +%if %{suse_version} >= 1000 && %{suse_version} < 1040 && %sles_version == 0 cp $RPM_BUILD_DIR/channels/%{suse_version}* $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels rename %{suse_version} opensuse $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/*.channel %endif -%if %{suse_version} > 1020 && %sles_version == 0 +%if %{suse_version} > 1030 && %sles_version == 0 cp $RPM_BUILD_DIR/channels/factory* $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels rename factory opensuse $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/*.channel %endif @@ -216,8 +215,12 @@ /opt/kde3/share/apps/ksmarttray /opt/kde3/bin/kde_add_smart_channel.sh /opt/kde3/share/apps/konqueror - %changelog +* Tue Sep 18 2007 - cthiel@suse.de +- updated default channels to include openSUSE 10.3 +* Tue Sep 18 2007 - cthiel@suse.de +- added "compressed" option to yast2 channels (defaults to packages.gz, but + autodetects legacy packages metadata) * Thu Sep 06 2007 - cthiel@suse.de - support compressed packages.gz in yast2 channels (#308080) * Wed Aug 29 2007 - cthiel@suse.de ++++++ channels.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/channels/1030.channel new/channels/1030.channel --- old/channels/1030.channel 1970-01-01 01:00:00.000000000 +0100 +++ new/channels/1030.channel 2007-09-18 11:14:09.000000000 +0200 @@ -0,0 +1,4 @@ +[opensuse] +name = openSUSE-10.3-FTP +baseurl = http://download.opensuse.org/distribution/10.3/repo/oss/ +type = yast2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/channels/1030-nonoss.channel new/channels/1030-nonoss.channel --- old/channels/1030-nonoss.channel 1970-01-01 01:00:00.000000000 +0100 +++ new/channels/1030-nonoss.channel 2007-09-18 11:14:27.000000000 +0200 @@ -0,0 +1,5 @@ +[opensuse-nonoss] +name = openSUSE-10.3-FTP-NonOSS +baseurl = http://download.opensuse.org/distribution/10.3/repo/non-oss/ +type = yast2 +disabled = yes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/channels/1030-updates.channel new/channels/1030-updates.channel --- old/channels/1030-updates.channel 1970-01-01 01:00:00.000000000 +0100 +++ new/channels/1030-updates.channel 2007-09-18 11:14:49.000000000 +0200 @@ -0,0 +1,4 @@ +[opensuse-updates] +name = openSUSE-10.3 Updates +baseurl = http://download.opensuse.org/update/10.3/ +type = rpm-md ++++++ smart-0.51-yast2_compressed-packages.patch ++++++ --- /var/tmp/diff_new_pack.w27690/_old 2007-09-20 01:56:37.000000000 +0200 +++ /var/tmp/diff_new_pack.w27690/_new 2007-09-20 01:56:37.000000000 +0200 @@ -1,6 +1,18 @@ --- smart/channels/yast2.py +++ smart/channels/yast2.py -@@ -40,9 +40,9 @@ +@@ -30,9 +30,10 @@ + import os + + class YaST2Channel(PackageChannel): +- def __init__(self, baseurl, *args): ++ def __init__(self, baseurl, compressed, *args): + super(YaST2Channel, self).__init__(*args) + self._baseurl = baseurl ++ self._compressed = compressed + + def getCacheCompareURLs(self): + return [posixpath.join(self._baseurl, "media.1/media")] +@@ -40,9 +41,9 @@ def getFetchSteps(self): return 4 @@ -12,14 +24,16 @@ fetcher.run(progress=progress) failed = item.getFailedReason() if failed: -@@ -77,21 +77,25 @@ +@@ -77,21 +78,27 @@ self.removeLoaders() descrdir = "suse/setup/descr" datadir = "RPMS" -+ uncompress = False ++ uncompress = self._compressed for line in open(fetched.getTargetPath()): if line.startswith("DESCRDIR"): descrdir = line[9:-1] if line.startswith("DATADIR"): datadir = line[8:-1] ++ # autodetect compressed/uncompressed SuSEtags metadata ++ if line.strip().endswith("packages"): uncompress = False + if line.strip().endswith("packages.gz"): uncompress = True # Fetch package information (req, dep, prov, etc) @@ -40,3 +54,23 @@ if not fetched or fetched.getStatus() == FAILED or open(fetched.getTargetPath()).read(9) != "=Ver: 2.0": raise Error, "YaST2 package descriptions not loaded." loader = YaST2Loader(self._baseurl, datadir, pkginfofile) +@@ -109,6 +116,7 @@ + + def create(alias, data): + return YaST2Channel(data["baseurl"], ++ data["compressed"], + data["type"], + alias, + data["name"], +--- smart/channels/yast2_info.py ++++ smart/channels/yast2_info.py +@@ -30,6 +30,8 @@ + """) + + fields = [("baseurl", _("Base URL"), str, None, +- _("Base URL of YaST2 repository, where the 'content' file is located."))] ++ _("Base URL of YaST2 repository, where the 'content' file is located.")), ++ ("compressed", _("Compressed SuSETags"), bool, True, ++ _("Use compressed SuSETags metadata)"))] + # ("medias", _("Medias"), str, "", + # _("Space separated list of medias. (NOT IN USE YET)"))] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de