packages: smart/smart-archscore.patch, smart/smart-pyc.patch, smart/smart-s...

glen glen at pld-linux.org
Thu Mar 24 14:30:34 CET 2011 

Author: glen                         Date: Thu Mar 24 13:30:34 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.3.1

---- Files affected:
packages/smart:
   smart-archscore.patch (1.3 -> 1.4) , smart-pyc.patch (1.2 -> 1.3) , smart-syslibs.patch (1.4 -> 1.5) , smart.spec (1.40 -> 1.41) , smart-am110.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/smart/smart-archscore.patch
diff -u packages/smart/smart-archscore.patch:1.3 packages/smart/smart-archscore.patch:1.4
--- packages/smart/smart-archscore.patch:1.3	Tue Jul 31 17:10:21 2007
+++ packages/smart/smart-archscore.patch	Thu Mar 24 14:30:28 2011
@@ -9,8 +9,8 @@
                  name = nameparts[0]
                  self.curpkgname = name
                  version = nameparts[1]
---- smart-0.51/smart/backends/rpm/base.py~	2006-11-07 21:22:46.000000000 +0100
-+++ smart-0.51/smart/backends/rpm/base.py	2007-07-31 17:03:17.713984667 +0200
+--- smart-1.3.1/smart/backends/rpm/base.py~	2011-03-23 09:54:57.000000000 +0200
++++ smart-1.3.1/smart/backends/rpm/base.py	2011-03-23 09:55:18.647706576 +0200
 @@ -41,8 +41,6 @@
          traceback.print_exc()
      raise Error, _("'rpm' python module is not available")
@@ -20,12 +20,12 @@
  __all__ = ["RPMPackage", "RPMProvides", "RPMNameProvides", "RPMPreRequires",
             "RPMRequires", "RPMUpgrades", "RPMConflicts", "RPMObsoletes",
             "rpm", "getTS", "system_provides"]
-@@ -190,8 +188,6 @@
-                 otherver, otherarch = splitarch(other.version)
-                 if selfver != otherver:
-                     rc = vercmp(self.version, other.version)
--                if rc == 0:
--                    rc = -cmp(archscore(selfarch), archscore(otherarch))
+@@ -192,8 +192,6 @@
+                 if rc == 0:
+                     if selfver != otherver:
+                         rc = vercmp(self.version, other.version)
+-                    if rc == 0:
+-                        rc = -cmp(archscore(selfarch), archscore(otherarch))
          return rc == -1
  
  class RPMProvides(Provides):         __slots__ = ()

================================================================
Index: packages/smart/smart-pyc.patch
diff -u packages/smart/smart-pyc.patch:1.2 packages/smart/smart-pyc.patch:1.3
--- packages/smart/smart-pyc.patch:1.2	Tue Jul 31 18:06:58 2007
+++ packages/smart/smart-pyc.patch	Thu Mar 24 14:30:28 2011
@@ -11,11 +11,11 @@
              infos[type] = getChannelInfo(type)
      return infos
 
---- smart-0.51/smart/__init__.py~	2007-01-15 20:27:34.000000000 +0100
-+++ smart-0.51/smart/__init__.py	2007-07-31 18:03:30.662806672 +0200
-@@ -166,19 +166,19 @@
-     if os.path.isdir(PLUGINSDIR):
-         entries.extend(os.listdir(PLUGINSDIR))
+--- smart-1.3.1/smart/__init__.py~	2010-05-03 14:34:05.000000000 +0300
++++ smart-1.3.1/smart/__init__.py	2011-03-23 09:54:23.668508204 +0200
+@@ -182,12 +182,12 @@
+     from smart import backends
+     pluginsdir = os.path.dirname(plugins.__file__)
      for entry in os.listdir(pluginsdir):
 -        if entry != "__init__.py" and entry.endswith(".py"):
 -            __import__("smart.plugins."+entry[:-3])
@@ -28,7 +28,8 @@
 +                initpath = os.path.join(entrypath, "__init__.pyc")
                  if os.path.isfile(initpath):
                      __import__("smart.plugins."+entry)
-     backendsdir = os.path.dirname(backends.__file__)
+     if os.path.isdir(PLUGINSDIR):
+@@ -198,7 +198,7 @@
      for entry in os.listdir(backendsdir):
          entrypath = os.path.join(backendsdir, entry)
          if os.path.isdir(entrypath):

================================================================
Index: packages/smart/smart-syslibs.patch
diff -u packages/smart/smart-syslibs.patch:1.4 packages/smart/smart-syslibs.patch:1.5
--- packages/smart/smart-syslibs.patch:1.4	Mon Jul 30 19:03:29 2007
+++ packages/smart/smart-syslibs.patch	Thu Mar 24 14:30:28 2011
@@ -9,14 +9,3 @@
  from smart import Error, _
  import textwrap
  import sys, os
---- smart-0.51/setup.py~	2006-11-20 15:49:51.000000000 +0100
-+++ smart-0.51/setup.py	2007-07-30 18:58:28.840510700 +0200
-@@ -56,7 +56,7 @@
- distutils.file_util.copy_file = copy_file
- distutils.dir_util.copy_tree = copy_tree
- 
--PYTHONLIB = os.path.join(get_python_lib(standard_lib=1, prefix=""),
-+PYTHONLIB = os.path.join(get_python_lib(standard_lib=1, plat_specific=1, prefix=""),
-                          "site-packages")
- 
- config_h = sysconfig.get_config_h_filename()

================================================================
Index: packages/smart/smart.spec
diff -u packages/smart/smart.spec:1.40 packages/smart/smart.spec:1.41
--- packages/smart/smart.spec:1.40	Tue Sep 21 21:00:15 2010
+++ packages/smart/smart.spec	Thu Mar 24 14:30:28 2011
@@ -5,24 +5,23 @@
 #
 # Conditional build:
 %bcond_with	kde	# with KDE support (not needed for GNOME)
-#
+
 %define	module smart
 Summary:	Next generation package handling tool
 Summary(pl.UTF-8):	Narzędzie do obsługi pakietów nowej generacji
 Name:		smart
-Version:	0.52
-Release:	7
-License:	GPL
+Version:	1.3.1
+Release:	0.2
+License:	GPL v2+
 Group:		Applications/System
-Source0:	http://labix.org/download/smart/%{name}-%{version}.tar.bz2
-# Source0-md5:	f1681adedd18b86f679a53ad8361c9e9
+Source0:	http://launchpad.net/smart/trunk/%{version}/+download/%{name}-%{version}.tar.bz2
+# Source0-md5:	678c22b4374dd3d732395df5250e6d42
 Source1:	%{name}-distro.py
 Source2:	%{name}.desktop
 Source3:	%{name}-kde.desktop
 Patch0:		%{name}-syslibs.patch
 Patch1:		%{name}-pyc.patch
 Patch2:		%{name}-archscore.patch
-Patch3:		%{name}-am110.patch
 Patch4:		%{name}-missingok.patch
 Patch5:		%{name}-pycurl-segfaults.patch
 URL:		http://labix.org/smart/
@@ -97,16 +96,15 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
-%patch5 -p0
+#%patch5 -p0
 
 # %{_libdir} is hardcoded
 %{__sed} -i -e's,/usr/lib/,%{_libdir}/,' smart/const.py
 
-rm -rf smart/util/elementtree
-rm -rf smart/util/celementtree
-rm -f smart/util/optparse.py
+rm -r smart/util/elementtree
+rm -r smart/util/celementtree
+rm smart/util/optparse.py
 
 %build
 export CFLAGS="%{rpmcflags}"
@@ -195,28 +193,16 @@
 %{py_sitedir}/%{module}/interfaces/*.py[co]
 %dir %{py_sitedir}/%{module}/interfaces/images
 %{py_sitedir}/%{module}/interfaces/images/*.py[co]
-%{py_sitedir}/%{module}/interfaces/images/folder.png
-%{py_sitedir}/%{module}/interfaces/images/package-available-locked.png
-%{py_sitedir}/%{module}/interfaces/images/package-available.png
-%{py_sitedir}/%{module}/interfaces/images/package-broken.png
-%{py_sitedir}/%{module}/interfaces/images/package-downgrade.png
-%{py_sitedir}/%{module}/interfaces/images/package-install.png
-%{py_sitedir}/%{module}/interfaces/images/package-installed-locked.png
-%{py_sitedir}/%{module}/interfaces/images/package-installed-outdated.png
-%{py_sitedir}/%{module}/interfaces/images/package-installed.png
-%{py_sitedir}/%{module}/interfaces/images/package-new-locked.png
-%{py_sitedir}/%{module}/interfaces/images/package-new.png
-%{py_sitedir}/%{module}/interfaces/images/package-purge.png
-%{py_sitedir}/%{module}/interfaces/images/package-reinstall.png
-%{py_sitedir}/%{module}/interfaces/images/package-remove.png
-%{py_sitedir}/%{module}/interfaces/images/package-upgrade.png
-%{py_sitedir}/%{module}/interfaces/images/smart.png
+%{py_sitedir}/%{module}/interfaces/images/*.png
 %dir %{py_sitedir}/%{module}/interfaces/text
 %{py_sitedir}/%{module}/interfaces/text/*.py[co]
 %dir %{py_sitedir}/%{module}/plugins
 %{py_sitedir}/%{module}/plugins/*.py[co]
 %dir %{py_sitedir}/%{module}/util
 %{py_sitedir}/%{module}/util/*.py[co]
+%if "%{py_ver}" > "2.4"
+%{py_sitedir}/smart-%{version}-*.egg-info
+%endif
 
 %files update
 %defattr(644,root,root,755)
@@ -226,12 +212,17 @@
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/%{module}/interfaces/gtk
 %{py_sitedir}/%{module}/interfaces/gtk/*.py[co]
+%dir %{py_sitedir}/%{module}/interfaces/qt
+%{py_sitedir}/%{module}/interfaces/qt/*.py[co]
 %{_desktopdir}/smart.desktop
 %if %{with kde}
 %{_desktopdir}/smart-kde.desktop
 %endif
 %{_pixmapsdir}/smart.png
 
+%dir %{py_sitedir}/%{module}/backends/arch
+%{py_sitedir}/%{module}/backends/arch/*.py[co]
+
 %if %{with kde}
 %files -n ksmarttray
 %defattr(644,root,root,755)
@@ -245,6 +236,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2011/03/24 13:30:28  glen
+- updated to 1.3.1
+
 Revision 1.40  2010/09/21 19:00:15  glen
 - release 7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smart/smart-archscore.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smart/smart-pyc.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smart/smart-syslibs.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smart/smart.spec?r1=1.40&r2=1.41&f=u

More information about the pld-cvs-commit mailing list