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.

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

1 files changed, 0 insertions, 70 deletions

diff --git a/meta/recipes-devtools/python/python-smartpm/smart-flag-exclude-packages.patch b/meta/recipes-devtools/python/python-smartpm/smart-flag-exclude-packages.patch
deleted file mode 100644
index 21a28746a1..0000000000
--- a/meta/recipes-devtools/python/python-smartpm/smart-flag-exclude-packages.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Add exclude-packages flag support
-
-Allow configuring specific packages to be excluded.  This will allow
-users to specify things NOT to install, and if they are attempted an
-error will be generated.
-
-Upstream-Status: Pending
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-Index: smart-1.4.1/smart/const.py
-===================================================================
---- smart-1.4.1.orig/smart/const.py
-+++ smart-1.4.1/smart/const.py
-@@ -70,6 +70,7 @@ DATADIR     = "/var/lib/smart/"
- USERDATADIR = "~/.smart/"
- CONFFILE    = "config"
- 
-+LOCKED_EXCLUDE     = Enum('LOCKED_EXCLUDE')
- LOCKED_INSTALL     = Enum('LOCKED_INSTALL')
- LOCKED_REMOVE      = Enum('LOCKED_REMOVE')
- LOCKED_CONFLICT    = Enum('LOCKED_CONFLICT')
-Index: smart-1.4.1/smart/transaction.py
-===================================================================
---- smart-1.4.1.orig/smart/transaction.py
-+++ smart-1.4.1/smart/transaction.py
-@@ -19,7 +19,7 @@
- # along with Smart Package Manager; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- #
--from smart.const import INSTALL, REMOVE, UPGRADE, FIX, REINSTALL, KEEP, LOCKED_INSTALL, LOCKED_CONFLICT, LOCKED_CONFLICT_BY, LOCKED_NO_COEXIST, LOCKED_SYSCONF, LOCKED_REMOVE
-+from smart.const import INSTALL, REMOVE, UPGRADE, FIX, REINSTALL, KEEP, LOCKED_EXCLUDE, LOCKED_INSTALL, LOCKED_CONFLICT, LOCKED_CONFLICT_BY, LOCKED_NO_COEXIST, LOCKED_SYSCONF, LOCKED_REMOVE
- from smart.cache import PreRequires, Package
- from smart import *
- 
-@@ -29,7 +29,9 @@ def lock_reason(pkg, lockvalue):
-     except TypeError:
-         reason = None
-         lockvalue = None
--    if reason == LOCKED_INSTALL:
-+    if reason == LOCKED_EXCLUDE:
-+        return _("%s is to be excluded") % pkg
-+    elif reason == LOCKED_INSTALL:
-         return _("%s is to be installed") % pkg
-     elif reason == LOCKED_CONFLICT:
-         return _("%s conflicts with %s") % (pkg, otherpkg)
-@@ -210,6 +212,10 @@ class Policy(object):
-                 self._sysconflocked.append(pkg)
-                 self._locked[pkg] = (LOCKED_SYSCONF, None)
- 
-+        for pkg in pkgconf.filterByFlag("exclude-packages", cache.getPackages()):
-+            if pkg not in self._locked:
-+                self._locked[pkg] = (LOCKED_EXCLUDE, None)
-+
-     def runFinished(self):
-         self._priorities.clear()
-         for pkg in self._sysconflocked:
-Index: smart-1.4.1/smart/commands/flag.py
-===================================================================
---- smart-1.4.1.orig/smart/commands/flag.py
-+++ smart-1.4.1/smart/commands/flag.py
-@@ -47,6 +47,8 @@ Currently known flags are:
-   multi-version - Flagged packages may have more than one version
-                   installed in the system at the same time
-                   (backend dependent).
-+  exclude-packages - Flagged packages will be excluded, if they are
-+                  required, an error will be generated.
-   ignore-recommends - Flagged packages will not be installed, if
-                   they are only recommended by a package to be
-                   installed rather than required.