SOURCES: smart-archscore.patch, smart-syslibs.patch - updated for ...
patrys
patrys at pld-linux.org
Mon Jul 30 18:27:07 CEST 2007
Author: patrys Date: Mon Jul 30 16:27:07 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 0.51
---- Files affected:
SOURCES:
smart-archscore.patch (1.1 -> 1.2) , smart-syslibs.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/smart-archscore.patch
diff -u SOURCES/smart-archscore.patch:1.1 SOURCES/smart-archscore.patch:1.2
--- SOURCES/smart-archscore.patch:1.1 Thu Mar 15 11:48:02 2007
+++ SOURCES/smart-archscore.patch Mon Jul 30 18:27:02 2007
@@ -1,86 +1,9 @@
-diff -Naur smart-0.50rc1.orig/smart/backends/rpm/base.py smart-0.50rc1/smart/backends/rpm/base.py
---- smart-0.50rc1.orig/smart/backends/rpm/base.py 2007-01-09 12:17:08.000000000 +0100
-+++ smart-0.50rc1/smart/backends/rpm/base.py 2007-01-09 12:19:22.000000000 +0100
-@@ -37,8 +37,6 @@
- except ImportError:
- raise Error, _("'rpm' python module is not available")
-
--archscore = rpm.archscore
--
- __all__ = ["RPMPackage", "RPMProvides", "RPMNameProvides", "RPMPreRequires",
- "RPMRequires", "RPMUpgrades", "RPMConflicts", "RPMObsoletes",
- "rpm", "getTS"]
-@@ -186,8 +184,6 @@
- otherver, otherarch = splitarch(other.version)
- 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__ = ()
-diff -Naur smart-0.50rc1.orig/smart/backends/rpm/header.py smart-0.50rc1/smart/backends/rpm/header.py
---- smart-0.50rc1.orig/smart/backends/rpm/header.py 2007-01-09 12:17:08.000000000 +0100
-+++ smart-0.50rc1/smart/backends/rpm/header.py 2007-01-09 12:17:57.000000000 +0100
-@@ -203,8 +203,6 @@
- if h[1106]: # RPMTAG_SOURCEPACKAGE
- continue
- arch = h[1022] # RPMTAG_ARCH
-- if rpm.archscore(arch) == 0:
-- continue
-
- name = h[1000] # RPMTAG_NAME
- epoch = h[1003] # RPMTAG_EPOCH
-diff -Naur smart-0.50rc1.orig/smart/backends/rpm/metadata.py smart-0.50rc1/smart/backends/rpm/metadata.py
---- smart-0.50rc1.orig/smart/backends/rpm/metadata.py 2007-01-09 12:17:08.000000000 +0100
-+++ smart-0.50rc1/smart/backends/rpm/metadata.py 2007-01-09 12:18:27.000000000 +0100
-@@ -160,10 +160,7 @@
- skip = None
-
- elif tag == ARCH:
-- if rpm.archscore(elem.text) == 0:
-- skip = PACKAGE
-- else:
-- arch = elem.text
-+ arch = elem.text
-
- elif tag == NAME:
- name = elem.text
-diff -Naur smart-0.50rc1.orig/smart/backends/rpm/redcarpet.py smart-0.50rc1/smart/backends/rpm/redcarpet.py
---- smart-0.50rc1.orig/smart/backends/rpm/redcarpet.py 2007-01-09 12:17:08.000000000 +0100
-+++ smart-0.50rc1/smart/backends/rpm/redcarpet.py 2007-01-09 12:18:47.000000000 +0100
-@@ -191,10 +191,7 @@
- self._release = data
-
- def handleArchEnd(self, name, attrs, data):
-- if rpm.archscore(data) == 0:
-- self._skip = self.PACKAGE
-- else:
-- self._arch = data
-+ self._arch = data
-
- def handleSectionEnd(self, name, attrs, data):
- self._info["group"] = data
-diff -Naur smart-0.50rc1.orig/smart/backends/rpm/synthesis.py smart-0.50rc1/smart/backends/rpm/synthesis.py
---- smart-0.50rc1.orig/smart/backends/rpm/synthesis.py 2007-01-09 12:17:08.000000000 +0100
-+++ smart-0.50rc1/smart/backends/rpm/synthesis.py 2007-01-09 12:20:11.000000000 +0100
-@@ -164,9 +164,6 @@
- else:
- version, arch = version[:dot], version[dot+1:]
- versionarch = "@".join((version, arch))
--
-- if rpm.archscore(arch) == 0:
-- continue
-
- name = "-".join(rpmnameparts[0:-2])
-
-diff -Naur smart-0.50rc1.orig/smart/backends/rpm/yast2.py smart-0.50rc1/smart/backends/rpm/yast2.py
---- smart-0.50rc1.orig/smart/backends/rpm/yast2.py 2007-01-09 12:17:08.000000000 +0100
-+++ smart-0.50rc1/smart/backends/rpm/yast2.py 2007-01-09 12:19:51.000000000 +0100
-@@ -175,8 +175,6 @@
- nameparts = entryname.split(" ")
- # skip entry if arch is not compatible
- arch = nameparts[3]
+--- smart-0.51/smart/backends/rpm/yast2.py~ 2007-07-30 18:25:25.000000000 +0200
++++ smart-0.51/smart/backends/rpm/yast2.py 2007-07-30 18:26:00.637721250 +0200
+@@ -181,8 +181,6 @@
+ raise Error("Error loading YaST2 channel info. Possibly " \
+ "corrupted file.\n%s" % self._pkginfofile)
+
- if rpm.archscore(arch) <= 0:
- return
name = nameparts[0]
================================================================
Index: SOURCES/smart-syslibs.patch
diff -u SOURCES/smart-syslibs.patch:1.2 SOURCES/smart-syslibs.patch:1.3
--- SOURCES/smart-syslibs.patch:1.2 Sat Mar 4 16:04:14 2006
+++ SOURCES/smart-syslibs.patch Mon Jul 30 18:27:02 2007
@@ -1,73 +1,3 @@
---- smart-0.41/smart/backends/rpm/metadata.py~ 2005-12-18 04:31:18.000000000 +0200
-+++ smart-0.41/smart/backends/rpm/metadata.py 2006-03-04 15:02:39.000000000 +0200
-@@ -22,7 +22,7 @@
- #
- from smart.cache import PackageInfo, Loader
- from smart.backends.rpm.base import *
--from smart.util import cElementTree
-+import cElementTree
- from smart import *
- import posixpath
- import locale
---- smart-0.41/smart/channels/rpm_md.py~ 2005-06-10 00:27:12.000000000 +0300
-+++ smart-0.41/smart/channels/rpm_md.py 2006-03-04 15:28:46.000000000 +0200
-@@ -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-0.41/setup.py~ 2006-03-04 15:32:52.000000000 +0200
-+++ smart-0.41/setup.py 2006-03-04 15:32:54.000000000 +0200
-@@ -44,23 +44,6 @@
- config_h = sysconfig.get_config_h_filename()
- config_h_vars = sysconfig.parse_config_h(open(config_h))
-
--# cElementTree needed defines
--CET_DEFINES = [
-- ("XML_STATIC", None),
-- ("XML_NS", "1"),
-- ("XML_DTD", "1"),
-- ("XML_CONTEXT_BYTES", "1024")
-- ]
--if "HAVE_MEMMOVE" in config_h_vars:
-- CET_DEFINES.append(("HAVE_MEMMOVE", "1"))
--if "HAVE_BCOPY" in config_h_vars:
-- CET_DEFINES.append(("HAVE_BCOPY", "1"))
--if sys.byteorder == "little":
-- CET_DEFINES.append(("BYTEORDER", "1234"))
--else:
-- CET_DEFINES.append(("BYTEORDER", "4321"))
--
--
- setup(name="smart",
- version = VERSION,
- description = "Smart Package Manager is a next generation package "
-@@ -87,7 +70,6 @@
- "smart.interfaces.images",
- "smart.plugins",
- "smart.util",
-- "smart.util.elementtree",
- ],
- scripts = ["smart.py"],
- ext_modules = [
-@@ -100,13 +82,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-0.41/smart/option.py~ 2005-07-19 23:12:55.000000000 +0300
+++ smart-0.41/smart/option.py 2006-03-04 16:26:11.000000000 +0200
@@ -19,7 +19,7 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/smart-archscore.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/smart-syslibs.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list