python-smartpm: 1.4.1 -> 1.5

* Remove the following patches since the are already in the source:
smart-config-ignore-all-recommends.patch
smart-conflict-provider.patch
smart-dflags.patch
smart-filename-NAME_MAX.patch
smart-flag-exclude-packages.patch
smart-flag-ignore-recommends.patch
smart-metadata-match.patch
smart-multilib-fixes.patch
smart-rpm-extra-macros.patch
smart-rpm-md-parse.patch
smart-rpm-root.patch
smart-tmpdir.patch
smart-yaml-error.patch

* Update the following patches, part of the code are already in the
  source:
smart-attempt.patch
smart-improve-error-reporting.patch
smart-recommends.patch
smartpm-rpm5-nodig.patch

* Use github and git repo as the SRC_URI.

(From OE-Core rev: 5fc580fc444e45d00de0e50d32b6e6e0b2e6b7ea)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 30 insertions, 17 deletions

diff --git a/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch b/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch
index 9919a941bc..fefb29a666 100644
--- a/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch
+++ b/meta/recipes-devtools/python/python-smartpm/smartpm-rpm5-nodig.patch
@@ -6,41 +6,54 @@ Upstream-Status: Pending
 
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 
-diff -ur smart-1.4.1.orig/smart/backends/rpm/base.py smart-1.4.1/smart/backends/rpm/base.py
---- smart-1.4.1.orig/smart/backends/rpm/base.py 2012-10-04 11:22:11.229351164 -0500
-+++ smart-1.4.1/smart/backends/rpm/base.py      2012-10-04 11:22:44.820170786 -0500
-@@ -53,8 +53,8 @@
+diff --git a/smart/backends/rpm/base.py b/smart/backends/rpm/base.py
+--- a/smart/backends/rpm/base.py
++++ b/smart/backends/rpm/base.py
+@@ -63,11 +63,11 @@ def getTS(new=False):
          if sysconf.get("rpm-dbpath"):
              rpm.addMacro('_dbpath', "/" + sysconf.get("rpm-dbpath"))
          getTS.ts = rpm.ts(getTS.root)
 -        if not sysconf.get("rpm-check-signatures", False):
--            getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
+-            if hasattr(rpm, '_RPMVSF_NOSIGNATURES'):
+-                getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
+-            else:
+-                raise Error, _("rpm requires checking signatures")
 +        #if not sysconf.get("rpm-check-signatures", False):
-+        #    getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
++        #    if hasattr(rpm, '_RPMVSF_NOSIGNATURES'):
++        #        getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
++        #    else:
++        #        raise Error, _("rpm requires checking signatures")
          rpm_dbpath = sysconf.get("rpm-dbpath", "var/lib/rpm")
-         dbdir = os.path.join(getTS.root, rpm_dbpath)
+         dbdir = rpm_join_dbpath(getTS.root, rpm_dbpath)
          if not os.path.isdir(dbdir):
-@@ -82,8 +82,8 @@
+@@ -89,11 +89,11 @@ def getTS(new=False):
          if sysconf.get("rpm-dbpath"):
              rpm.addMacro('_dbpath', "/" + sysconf.get("rpm-dbpath"))
          ts = rpm.ts(getTS.root)
 -        if not sysconf.get("rpm-check-signatures", False):
--            ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
+-            if hasattr(rpm, '_RPMVSF_NOSIGNATURES'):
+-                ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
+-            else:
+-                raise Error, _("rpm requires checking signatures")
 +        #if not sysconf.get("rpm-check-signatures", False):
-+        #    ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
++        #    if hasattr(rpm, '_RPMVSF_NOSIGNATURES'):
++        #        ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
++        #    else:
++        #        raise Error, _("rpm requires checking signatures")
          return ts
      else:
          return getTS.ts
-diff -ur smart-1.4.1.orig/smart/plugins/yumchannelsync.py smart-1.4.1/smart/plugins/yumchannelsync.py
---- smart-1.4.1.orig/smart/plugins/yumchannelsync.py    2010-12-06 03:11:05.000000000 -0600
-+++ smart-1.4.1/smart/plugins/yumchannelsync.py 2012-10-04 11:23:09.799350924 -0500
-@@ -56,7 +56,8 @@
+diff --git a/smart/plugins/yumchannelsync.py b/smart/plugins/yumchannelsync.py
+--- a/smart/plugins/yumchannelsync.py
++++ b/smart/plugins/yumchannelsync.py
+@@ -56,8 +56,8 @@ def _getreleasever():
  
      rpmroot = sysconf.get("rpm-root", "/")
      ts = rpmUtils.transaction.initReadOnlyTransaction(root=rpmroot)
--    ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
-+    #ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
-+    ts.pushVSFlags(~(rpm._RPMVSF_NODIGESTS))
+-    if hasattr(rpm, '_RPMVSF_NOSIGNATURES') and hasattr(rpm, '_RPMVSF_NODIGESTS'):
+-        ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
++    #if hasattr(rpm, '_RPMVSF_NOSIGNATURES') and hasattr(rpm, '_RPMVSF_NODIGESTS'):
++    #    ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
      releasever = None
      # HACK: we're hard-coding the most used distros, will add more if needed
      idx = ts.dbMatch('provides', 'fedora-release')