[yum-langpacks/f17] Upstream patches to fix bugs.

[Bill Nottingham]

commit 6d18891fcefd9093044927a260132fe794d0727a
Author: Bill Nottingham <notting at redhat.com>
Date:   Mon Aug 13 15:50:55 2012 -0400

    Upstream patches to fix bugs.

 460f50548587f692499daae9e38e5c17c85fa078.patch |   42 ++++++++++++++++++++++++
 59965b7104d76fb032a57650ec0d1e126ece88f1.patch |   19 +++++++++++
 yum-langpacks.spec                             |   11 ++++++-
 3 files changed, 71 insertions(+), 1 deletions(-)
---
diff --git a/460f50548587f692499daae9e38e5c17c85fa078.patch b/460f50548587f692499daae9e38e5c17c85fa078.patch
new file mode 100644
index 0000000..f1a6dcb
--- /dev/null
+++ b/460f50548587f692499daae9e38e5c17c85fa078.patch
@@ -0,0 +1,42 @@
+commit 460f50548587f692499daae9e38e5c17c85fa078 (HEAD, origin/master, origin/HEAD, master)
+Author: Bill Nottingham <notting at redhat.com>
+Date:   Mon Aug 13 15:47:31 2012 -0400
+
+    Fix plugin type to work correctly with registerCommand, and avoid similar failures in the future. (#847502)
+
+diff --git a/langpacks.py b/langpacks.py
+index 09f1136..d1b0b33 100644
+--- a/langpacks.py
++++ b/langpacks.py
+@@ -17,7 +17,7 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ 
+-from yum.plugins import TYPE_CORE
++from yum.plugins import TYPE_INTERACTIVE
+ 
+ from yum.constants import *
+ 
+@@ -38,7 +38,7 @@ def iterparse(filename):
+         print >>sys.stderr, '%s: %s' % (filename, str(e))
+ 
+ requires_api_version = '2.5'
+-plugin_type = TYPE_CORE
++plugin_type = TYPE_INTERACTIVE
+ 
+ langs = []
+ langinstalled = []
+@@ -130,9 +130,10 @@ def config_hook(conduit):
+     if hasattr(parser, 'plugin_option_group'):
+         parser = parser.plugin_option_group
+ 
+-    conduit.registerCommand(LanginstallCommand())
+-    conduit.registerCommand(LangremoveCommand())
+-    conduit.registerCommand(LanglistCommand())
++    if hasattr(conduit, 'registerCommand'):
++        conduit.registerCommand(LanginstallCommand())
++        conduit.registerCommand(LangremoveCommand())
++        conduit.registerCommand(LanglistCommand())
+ 
+ def init_hook(conduit):
+     global langs
diff --git a/59965b7104d76fb032a57650ec0d1e126ece88f1.patch b/59965b7104d76fb032a57650ec0d1e126ece88f1.patch
new file mode 100644
index 0000000..3352399
--- /dev/null
+++ b/59965b7104d76fb032a57650ec0d1e126ece88f1.patch
@@ -0,0 +1,19 @@
+commit 59965b7104d76fb032a57650ec0d1e126ece88f1
+Author: Bill Nottingham <notting at redhat.com>
+Date:   Mon Aug 13 15:47:15 2012 -0400
+
+    Fix traceback on groupinstall of a group with langonly set. (#840885)
+
+diff --git a/langpacks.py b/langpacks.py
+index ca8dc49..09f1136 100644
+--- a/langpacks.py
++++ b/langpacks.py
+@@ -224,7 +224,7 @@ def remove_deps_from_ts(conduit, po):
+             conduit.info(5,"Failed to remove package %s" % (pkg.name,))
+             continue
+ 
+-def add_matches_from_ts(conduit, lang, base):
++def add_matches_from_ts(conduit, lang, base = None):
+     global langinstalled
+ 
+     if conduit:
diff --git a/yum-langpacks.spec b/yum-langpacks.spec
index 3a5c6ed..99bb813 100644
--- a/yum-langpacks.spec
+++ b/yum-langpacks.spec
@@ -3,7 +3,7 @@
 Summary: Langpacks plugin for yum
 Name: yum-langpacks
 Version: 0.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source0: http://petersen.fedorapeople.org/%{name}/%{name}-%{version}.tar.gz
@@ -12,6 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-setuptools
 Requires: yum >= 3.0
+Patch1: 460f50548587f692499daae9e38e5c17c85fa078.patch
+Patch2: 59965b7104d76fb032a57650ec0d1e126ece88f1.patch
 
 %description
 Yum-langpacks is a plugin for YUM that looks for langpacks for your native
@@ -19,6 +21,9 @@ language for packages you install.
 
 %prep
 %setup -q
+# upstream patches
+%patch1 -p1
+%patch2 -p1
 %build
 
 %install
@@ -35,6 +40,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/langpacks.conf
 
 %changelog
+* Mon Aug 13 2012 Bill Nottingham <notting at redhat.com> - 0.3.1-1
+- fix groupinstall of langonly groups (#840885)
+- fix plugin type for use in yumex, elsewhere (#847502)
+
 * Wed Aug 08 2012 Bill Nottingham <notting at redhat.com> - 0.3.0-1
 - add langinstall/langremove/langlist commands (#840885)