Hello community,
here is the log from the commit of package smart
checked in at Thu Jun 8 10:39:44 CEST 2006.
--------
--- smart/smart.changes 2006-06-03 01:11:23.000000000 +0200
+++ smart/smart.changes 2006-06-07 16:32:39.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Jun 7 16:17:01 CEST 2006 - cthiel@suse.de
+
+- added one patch from Pascal Bleser
+ * smart-fix-none-obsoleteversion.patch
+- require the same RPM release in subpackages
+- call kde_post_install for ksmarttray subpackage
+
+-------------------------------------------------------------------
+Wed Jun 7 15:51:58 CEST 2006 - cthiel@suse.de
+
+- added smart-0.41-channel-editor.patch (#169678)
+
+-------------------------------------------------------------------
@@ -4,2 +17,2 @@
-- updated smart-trunk.diff (r704)
-- updated smart-YaST2.diff (r704)
+- updated smart-trunk.patch (r704)
+- updated smart-YaST2.patch (r704)
@@ -7,4 +20,4 @@
- * smart-channel-mirrors.diff
- * smart-mirror-workaround.diff
- * smart-fix-obsoleteversion-type-error.diff
- * smart-fix-search-with-empty-description.diff
+ * smart-channel-mirrors.patch
+ * smart-mirror-workaround.patch
+ * smart-fix-obsoleteversion-type-error.patch
+ * smart-fix-search-with-empty-description.patch
@@ -22,2 +35,2 @@
-- updated smart-YaST2.diff (r698)
-- split of smart-trunk.diff from smart-YaST2.diff
+- updated smart-YaST2.patch (r698)
+- split of smart-trunk.patch from smart-YaST2.patch
@@ -33 +46 @@
-- updated smart-YaST2.diff (r696)
+- updated smart-YaST2.patch (r696)
@@ -43 +56 @@
-- updated smart-YaST2.diff (fixes #149845)
+- updated smart-YaST2.patch (fixes #149845)
@@ -58 +71 @@
-- updated smart-YaST2.diff
+- updated smart-YaST2.patch
@@ -69 +82 @@
-- added smart-YaST2.diff: experimental support for YaST2 repositories by
+- added smart-YaST2.patch: experimental support for YaST2 repositories by
@@ -76 +89 @@
-- removed smart-trunk.diff
+- removed smart-trunk.patch
@@ -94 +107 @@
-- added patch to the protectedread code from SVN (smart-trunk.diff)
+- added patch to the protectedread code from SVN (smart-trunk.patch)
Old:
----
smart-0.41.diff
smart-YaST2.diff
smart-channel-mirrors.diff
smart-fix-obsoleteversion-type-error.diff
smart-fix-search-with-empty-description.diff
smart-ksmarttray-guard.diff
smart-mirror-workaround.diff
smart-trunk.diff
New:
----
smart-0.41-channel-editor.patch
smart-0.41.patch
smart-YaST2.patch
smart-channel-mirrors.patch
smart-fix-none-obsoleteversion.patch
smart-fix-obsoleteversion-type-error.patch
smart-fix-search-with-empty-description.patch
smart-ksmarttray-guard.patch
smart-mirror-workaround.patch
smart-trunk.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smart.spec ++++++
--- /var/tmp/diff_new_pack.VeEZuf/_old 2006-06-08 10:39:19.000000000 +0200
+++ /var/tmp/diff_new_pack.VeEZuf/_new 2006-06-08 10:39:19.000000000 +0200
@@ -14,19 +14,21 @@
BuildRequires: kdelibs3-devel python-devel python-elementtree python-gtk rpm-devel rpm-python update-desktop-files
Summary: Smart Package Manager
Version: 0.41
-Release: 24
+Release: 25
Source: %{name}-%{version}.tar.bz2
Source1: distro.py
Source2: %{name}.desktop
Source3: %{name}-ksmarttray.desktop
-Patch: %{name}-%{version}.diff
-Patch1: %{name}-YaST2.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
+Patch: %{name}-%{version}.patch
+Patch1: %{name}-YaST2.patch
+Patch2: %{name}-trunk.patch
+Patch3: %{name}-ksmarttray-guard.patch
+Patch4: %{name}-channel-mirrors.patch
+Patch5: %{name}-mirror-workaround.patch
+Patch6: %{name}-fix-obsoleteversion-type-error.patch
+Patch7: %{name}-fix-search-with-empty-description.patch
+Patch8: %{name}-fix-none-obsoleteversion.patch
+Patch9: %{name}-%{version}-channel-editor.patch
URL: http://smartpm.org
Group: System/Packages
License: GPL
@@ -52,7 +54,7 @@
%package gui
Summary: Graphical User Interface for smart
Group: System/Packages
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
Requires: python-gtk
%description gui
@@ -67,8 +69,8 @@
%package ksmarttray
Summary: KDE System Tray for the Smart Package Manager
Group: System/Packages
-Requires: %{name} = %{version}
-Requires: %{name}-gui = %{version}
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-gui = %{version}-%{release}
%description ksmarttray
KDE System Tray for the Smart Package Manager.
@@ -89,6 +91,8 @@
%patch5
%patch6
%patch7
+%patch8
+%patch9
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -128,7 +132,9 @@
%{__install} -D -m 0644 contrib/servicemenus/add_smart_channel.desktop \
"$RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus/add_smart_channel.desktop"
pushd contrib/ksmarttray
+. /etc/opt/kde3/common_options
%{makeinstall}
+kde_post_install
popd
%suse_update_desktop_file %name System PackageManager
%suse_update_desktop_file %name-ksmarttray System PackageManager
@@ -166,44 +172,51 @@
/opt/kde3/share/apps/konqueror
%changelog -n smart
+* Wed Jun 07 2006 - cthiel@suse.de
+- added one patch from Pascal Bleser
+ * smart-fix-none-obsoleteversion.patch
+- require the same RPM release in subpackages
+- call kde_post_install for ksmarttray subpackage
+* Wed Jun 07 2006 - cthiel@suse.de
+- added smart-0.41-channel-editor.patch (#169678)
* Sat Jun 03 2006 - cthiel@suse.de
-- updated smart-trunk.diff (r704)
-- updated smart-YaST2.diff (r704)
+- updated smart-trunk.patch (r704)
+- updated smart-YaST2.patch (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
+ * smart-channel-mirrors.patch
+ * smart-mirror-workaround.patch
+ * smart-fix-obsoleteversion-type-error.patch
+ * smart-fix-search-with-empty-description.patch
- added smart-ksmarttray.desktop
* Wed Apr 26 2006 - cthiel@suse.de
- new subpackage ksmarttray
- included KDE service menus
* Wed Apr 26 2006 - cthiel@suse.de
-- updated smart-YaST2.diff (r698)
-- split of smart-trunk.diff from smart-YaST2.diff
+- updated smart-YaST2.patch (r698)
+- split of smart-trunk.patch from smart-YaST2.patch
* Sat Mar 04 2006 - cthiel@suse.de
- updated to reflect python changes due to #149809
* Mon Feb 20 2006 - cthiel@suse.de
-- updated smart-YaST2.diff (r696)
+- updated smart-YaST2.patch (r696)
* Wed Feb 15 2006 - stbinner@suse.de
- fix Name in .desktop file
* Mon Feb 13 2006 - cthiel@suse.de
-- updated smart-YaST2.diff (fixes #149845)
+- updated smart-YaST2.patch (fixes #149845)
* Sun Feb 05 2006 - cthiel@suse.de
- fix requires (added python-xml)
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Jan 18 2006 - cthiel@suse.de
-- updated smart-YaST2.diff
+- updated smart-YaST2.patch
* Wed Jan 11 2006 - cthiel@suse.de
- make sure not to package cElementTree, because we use the system one
anyway
* Thu Jan 05 2006 - cthiel@suse.de
-- added smart-YaST2.diff: experimental support for YaST2 repositories by
+- added smart-YaST2.patch: experimental support for YaST2 repositories by
Mauricio Teixeira
* Wed Dec 21 2005 - cthiel@suse.de
- update to version 0.41
-- removed smart-trunk.diff
+- removed smart-trunk.patch
* Wed Dec 21 2005 - cthiel@suse.de
- fix requires
* Tue Nov 22 2005 - cthiel@suse.de
@@ -212,7 +225,7 @@
- branched smart-gui
- added distro.py
- added desktop file
-- added patch to the protectedread code from SVN (smart-trunk.diff)
+- added patch to the protectedread code from SVN (smart-trunk.patch)
* Wed Nov 02 2005 - cthiel@suse.de
- added various patches
* Mon Oct 17 2005 - cthiel@suse.de
++++++ smart-0.41-channel-editor.patch ++++++
--- smart/interfaces/gtk/channels.py
+++ smart/interfaces/gtk/channels.py
@@ -226,6 +226,7 @@
newchannels = parseChannelsDescription(data)
for alias in newchannels:
newchannel = newchannels[alias]
+ editor = ChannelEditor()
if editor.show(alias, newchannel, editalias=True):
alias = newchannel["alias"]
del newchannel["alias"]
@@ -258,6 +259,7 @@
foundchannel = False
for newchannel in detectLocalChannels(path):
foundchannel = True
+ editor = ChannelEditor()
if editor.show(newchannel.get("alias"), newchannel,
editalias=True):
alias = newchannel["alias"]
++++++ smart-0.41.patch ++++++
--- contrib/smart-update/Makefile
+++ contrib/smart-update/Makefile
@@ -1,6 +1,6 @@
smart-update: smart-update.c
- $(CC) -Wall $< -o $@
+ $(CC) $(CFLAGS) -Wall $< -o $@
clean:
rm -f smart-update
--- setup.py
+++ setup.py
@@ -87,7 +87,6 @@
"smart.interfaces.images",
"smart.plugins",
"smart.util",
- "smart.util.elementtree",
],
scripts = ["smart.py"],
ext_modules = [
@@ -99,13 +99,6 @@
["smart/util/ctagfile.c"]),
Extension("smart.util.cdistance",
["smart/util/cdistance.c"]),
- Extension("smart.util.cElementTree",
- ["smart/util/celementtree/cElementTree.c",
- "smart/util/celementtree/expat/xmlparse.c",
- "smart/util/celementtree/expat/xmlrole.c",
- "smart/util/celementtree/expat/xmltok.c"],
- include_dirs=["smart/util/celementtree/expat"],
- define_macros=CET_DEFINES),
],
data_files = I18NFILES +
[(PYTHONLIB+"/smart/interfaces/images",
--- smart/backends/deb/loader.py
+++ smart/backends/deb/loader.py
@@ -33,7 +33,10 @@
import stat
import os
-ENCODING = locale.getpreferredencoding()
+try:
+ ENCODING = locale.getpreferredencoding()
+except locale.Error:
+ ENCODING = "C"
class DebPackageInfo(PackageInfo):
--- smart/backends/rpm/header.py
+++ smart/backends/rpm/header.py
@@ -241,7 +241,11 @@
vi = v[i] or None
if vi and vi[:2] == "0:":
vi = vi[2:]
- r = CM.get(f[i]&CF)
+ if i == 0 and type(f) != list:
+ fi = f
+ else:
+ fi = f[i]
+ r = CM.get(fi&CF)
if ((r is not None and r != "=") or
((Prv, ni, vi) not in prvdict)):
# RPMSENSE_PREREQ |
@@ -249,6 +253,8 @@
# RPMSENSE_SCRIPT_PREUN |
# RPMSENSE_SCRIPT_POST |
# RPMSENSE_SCRIPT_POSTUN == 7744
+ if type(f) != list:
+ f = [f]
reqdict[(f[i]&7744 and PreReq or Req,
intern(ni), r, vi)] = True
reqargs = reqdict.keys()
--- smart/backends/rpm/metadata.py
+++ smart/backends/rpm/metadata.py
@@ -22,8 +22,8 @@
#
from smart.cache import PackageInfo, Loader
from smart.backends.rpm.base import *
-from smart.util import cElementTree
from smart import *
+import cElementTree
import posixpath
import locale
import os
--- smart/backends/rpm/pm.py
+++ smart/backends/rpm/pm.py
@@ -35,7 +35,10 @@
import fcntl
import time
-ENCODING = locale.getpreferredencoding()
+try:
+ ENCODING = locale.getpreferredencoding()
+except locale.Error:
+ ENCODING = "C"
class RPMPackageManager(PackageManager):
--- smart/ccache.c
+++ smart/ccache.c
@@ -1458,6 +1458,8 @@
CacheObject *cache;
+ int found;
+
if (!self->_cache) {
PyErr_SetString(PyExc_TypeError, "Cache not set");
return NULL;
@@ -1699,7 +1701,7 @@
}
/* found = False */
- int found = 0;
+ found = 0;
/* lst = cache._objmap.get(pkgargs) */
lst = PyDict_GetItem(cache->_objmap, pkgargs);
/* if lst is not None: */
@@ -2111,8 +2113,9 @@
PyObject *state = PyDict_New();
PyObject *self__stateversion__;
PyMemberDef *members = Loader_Type.tp_members;
+ int i;
if (!state) return NULL;
- int i = 0;
+ i = 0;
PyErr_Clear();
while (members[i].name) {
PyObject *obj = PyMember_GetOne((char *)self, &members[i]);
@@ -2139,6 +2142,7 @@
PyMemberDef *members = Loader_Type.tp_members;
PyObject *self__stateversion__;
PyObject *__stateversion__;
+ PyObject *dict;
if (!PyDict_Check(state)) {
PyErr_SetString(StateVersionError, "");
return NULL;
@@ -2153,7 +2157,7 @@
return NULL;
}
Py_DECREF(self__stateversion__);
- PyObject *dict = PyObject_GetAttrString((PyObject *)self, "__dict__");
+ dict = PyObject_GetAttrString((PyObject *)self, "__dict__");
if (dict) {
PyObject *keys = PyDict_Keys(state);
int i, ilen;
@@ -2415,6 +2419,7 @@
/* for loader in loaders: */
ilen = PyList_GET_SIZE(self->_loaders);
for (i = 0; i != ilen; i++) {
+ int j, jlen;
LoaderObject *loader =
(LoaderObject *)PyList_GET_ITEM(self->_loaders, i);
if (!PyObject_IsInstance((PyObject *)loader,
@@ -2425,7 +2430,6 @@
}
/* for pkg in loader._packages: */
- int j, jlen;
jlen = PyList_GET_SIZE(loader->_packages);
for (j = 0; j != jlen; j++) {
PackageObject *pkg = (PackageObject *)
--- smart/channels/rpm_md.py
+++ smart/channels/rpm_md.py
@@ -21,7 +21,7 @@
#
from smart.backends.rpm.metadata import RPMMetaDataLoader
from smart.util.filetools import getFileDigest
-from smart.util.elementtree import ElementTree
+from elementtree import ElementTree
from smart.const import SUCCEEDED, FAILED, NEVER, ALWAYS
from smart.channel import PackageChannel
from smart import *
--- smart/interfaces/gtk/log.py
+++ smart/interfaces/gtk/log.py
@@ -25,7 +25,10 @@
import gtk, gobject
import locale
-ENCODING = locale.getpreferredencoding()
+try:
+ ENCODING = locale.getpreferredencoding()
+except locale.Error:
+ ENCODING = "C"
class GtkLog(gtk.Window):
++++++ smart-YaST2.patch ++++++
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.
+#
+# Written by Mauricio Teixeira
participants (1)
-
root@suse.de