From d9c6f7f7062c2e109efb284b2e006332460372f7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 16 2015 13:37:59 +0000 Subject: import yum-langpacks-0.4.2-4.el7 --- diff --git a/SOURCES/yum-langpacks-0.4.2-fix-zh_CN-locale-packages.patch b/SOURCES/yum-langpacks-0.4.2-fix-zh_CN-locale-packages.patch new file mode 100644 index 0000000..ea49220 --- /dev/null +++ b/SOURCES/yum-langpacks-0.4.2-fix-zh_CN-locale-packages.patch @@ -0,0 +1,60 @@ +--- yum-langpacks-0.4.2.old/langpacks.py 2014-11-20 23:09:11.495254242 +0530 ++++ yum-langpacks-0.4.2/langpacks.py 2014-11-20 18:03:55.000000000 +0530 +@@ -311,18 +311,22 @@ + if lname: + if pkgs.find(lname, len(pkgs)-len(lname), len(pkgs)) > 0 : + avl_langpack_pkgs.append(pkgs) +- if len(lang) > 4 and lang.find("_") != -1: +- mainlang = lang[0:lang.find("_")] +- if pkgs.find(lang, len(pkgs)-len(lang), len(pkgs)) > 0 : +- avl_langpack_pkgs.append(pkgs) +- # if input pt_BR then show for pt and pt_BR +- # if input zh_CN then show for zh and zh_CN +- elif pkgs.find(mainlang, len(pkgs)-len(mainlang), len(pkgs)) > 0 : +- avl_langpack_pkgs.append(pkgs) + +- if lname: +- if pkgs.find(lname, len(pkgs)-len(lname), len(pkgs)) > 0 : +- avl_langpack_pkgs.append(pkgs) ++ if len(lang) > 4: ++ if lang.find("_") != -1: ++ mainlang = lang[0:lang.find("_")] ++ if lang.find("_CN") != -1 and pkgs.find("-CN") != -1: ++ avl_langpack_pkgs.append(pkgs) ++ if pkgs.find(lang, len(pkgs)-len(lang), len(pkgs)) > 0: ++ avl_langpack_pkgs.append(pkgs) ++ # if input pt_BR then show for pt and pt_BR ++ # if input zh_CN then show for zh and zh_CN ++ elif pkgs.find(mainlang, len(pkgs)-len(mainlang), len(pkgs)) > 0: ++ avl_langpack_pkgs.append(pkgs) ++ ++ if lname: ++ if pkgs.find(lname, len(pkgs)-len(lname), len(pkgs)) > 0: ++ avl_langpack_pkgs.append(pkgs) + + return sorted(avl_langpack_pkgs) + +@@ -414,6 +418,11 @@ + if p not in pkgmatches: + pkgmatches.append(p) + ++ # This is special case to cover package name man-pages-zh-CN ++ # which should have been named as man-pages-zh_CN ++ if lang.find("zh_CN") != -1: ++ pkgmatches.append("man-pages-zh-CN") ++ + pkgs = get_matches(sack, pkgmatches) + for pkg in pkgs: + if yb.rpmdb.searchNevra(name=pkg.name): +@@ -446,6 +455,11 @@ + if p not in pkgmatches: + pkgmatches.append(p) + ++ # This is special case to cover package name man-pages-zh-CN ++ # which should have been named as man-pages-zh_CN ++ if lang.find("zh_CN") != -1: ++ pkgmatches.append("man-pages-zh-CN") ++ + pkgs = get_matches(yb.rpmdb, pkgmatches) + for pkg in pkgs: + if conduit and hasattr(conduit, 'registerPackageName'): diff --git a/SPECS/yum-langpacks.spec b/SPECS/yum-langpacks.spec index 0e09f52..efcf3b2 100644 --- a/SPECS/yum-langpacks.spec +++ b/SPECS/yum-langpacks.spec @@ -1,12 +1,13 @@ Summary: Langpacks plugin for yum Name: yum-langpacks Version: 0.4.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Development/Tools Source0: https://fedorahosted.org/releases/y/u/%{name}/%{name}-%{version}.tar.gz # upstream commited patches Patch0: yum-langpacks-0.4.2-fix-langinfo-command.patch +Patch1: yum-langpacks-0.4.2-fix-zh_CN-locale-packages.patch URL: https://fedorahosted.org/yum-langpacks/ BuildArch: noarch @@ -22,6 +23,7 @@ language for packages you install. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build @@ -39,6 +41,9 @@ install -p -m 644 yum-langpacks.8.gz %{buildroot}%{_mandir}/man8/yum-langpacks.8 %{_mandir}/man8/yum-langpacks.8.gz %changelog +* Wed Jun 03 2015 Parag Nemade - 0.4.2-4 +- Resolves:rh#1165731: man-pages-zh-CN is not installed for zh_CN + * Fri Dec 27 2013 Daniel Mach - 0.4.2-3 - Mass rebuild 2013-12-27