From 252a932c4d219c0f8904fda1cede362b12f091da Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 28 Nov 2006 15:39:19 +0000 Subject: [PATCH] * Tue Nov 28 2006 Dan Walsh 1.33.5-1 - Merge to upstream - Fix makefile line Resolves: #208838 --- .cvsignore | 1 + policycoreutils-po.patch | 3587 ++++++++++++++++++++++-------------- policycoreutils-rhat.patch | 31 +- policycoreutils.spec | 13 +- sources | 2 +- 5 files changed, 2222 insertions(+), 1412 deletions(-) diff --git a/.cvsignore b/.cvsignore index b72b3e7..681bb27 100644 --- a/.cvsignore +++ b/.cvsignore @@ -118,3 +118,4 @@ policycoreutils-1.32.tgz policycoreutils-1.33.1.tgz policycoreutils-1.33.2.tgz policycoreutils-1.33.4.tgz +policycoreutils-1.33.5.tgz diff --git a/policycoreutils-po.patch b/policycoreutils-po.patch index 6fdf72b..40ae1e8 100644 --- a/policycoreutils-po.patch +++ b/policycoreutils-po.patch @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.33.4/po/af.po --- nsapolicycoreutils/po/af.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.4/po/af.po 2006-11-24 08:58:24.000000000 -0500 ++++ policycoreutils-1.33.4/po/af.po 2006-11-28 10:32:57.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -1110,7 +1110,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.33.4/po/am.po --- nsapolicycoreutils/po/am.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.4/po/am.po 2006-11-24 08:58:24.000000000 -0500 ++++ policycoreutils-1.33.4/po/am.po 2006-11-28 10:32:57.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -2220,7 +2220,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.33.4/po/ar.po --- nsapolicycoreutils/po/ar.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.4/po/ar.po 2006-11-24 08:58:24.000000000 -0500 ++++ policycoreutils-1.33.4/po/ar.po 2006-11-28 10:32:57.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -3330,7 +3330,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-1.33.4/po/as.po --- nsapolicycoreutils/po/as.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.4/po/as.po 2006-11-24 08:58:24.000000000 -0500 ++++ policycoreutils-1.33.4/po/as.po 2006-11-28 10:32:57.000000000 -0500 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: as\n" @@ -4440,7 +4440,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-1.33.4/po/be.po --- nsapolicycoreutils/po/be.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.4/po/be.po 2006-11-24 08:58:24.000000000 -0500 ++++ policycoreutils-1.33.4/po/be.po 2006-11-28 10:32:57.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -5550,7 +5550,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-1.33.4/po/bg.po --- nsapolicycoreutils/po/bg.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.4/po/bg.po 2006-11-24 08:58:24.000000000 -0500 ++++ policycoreutils-1.33.4/po/bg.po 2006-11-28 10:32:57.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -6660,8 +6660,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.33.4/po/bn_IN.po --- nsapolicycoreutils/po/bn_IN.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.4/po/bn_IN.po 2006-11-24 08:58:24.000000000 -0500 -@@ -36,15 +36,15 @@ ++++ policycoreutils-1.33.4/po/bn_IN.po 2006-11-28 10:32:57.000000000 -0500 +@@ -36,8 +36,8 @@ msgstr "" "Project-Id-Version: bn_IN\n" "Report-Msgid-Bugs-To: \n" @@ -6672,15 +6672,15 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreut "Last-Translator: Runa Bhattacharjee \n" "Language-Team: Bengali India\n" "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" +@@ -46,6 +46,7 @@ "X-Generator: KBabel 1.9.1\n" --"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" "\n" ++"\n" #: ../load_policy/load_policy.c:22 -@@ -57,230 +57,280 @@ + #, c-format +@@ -57,230 +58,280 @@ msgid "%s: Can't load policy: %s\n" msgstr "%s: চিহ্নিত নিয়মনীতি লোড করা যায়নি: %s\n" @@ -7062,7 +7062,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreut msgid "failed to exec shell\n" msgstr "শেল exec করতে ব্যর্থ\n" -@@ -294,27 +344,32 @@ +@@ -294,27 +345,32 @@ " এই ক্ষেত্রে: