From b82d67fec98a25a6af2b2e38123e5010b4dc2d491d1519bbfceaa7faab9c0a1e Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 16 Sep 2011 12:38:52 +0000
Subject: [PATCH] Accepting request 81142 from home:vuntz:branches:Base:System

Do not mark .mo files as %doc

OBS-URL: https://build.opensuse.org/request/show/81142
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=144
---
 findlang.diff            | 12 ++++++------
 langnoc.diff             |  4 ++--
 remove-translations.diff |  2 +-
 rpm.changes              |  8 ++++++++
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/findlang.diff b/findlang.diff
index 51b9ab3..129b2c1 100644
--- a/findlang.diff
+++ b/findlang.diff
@@ -1,5 +1,7 @@
---- ./scripts/find-lang.sh.orig	2010-12-03 12:11:57.000000000 +0000
-+++ ./scripts/find-lang.sh	2011-05-11 14:53:34.000000000 +0000
+Index: scripts/find-lang.sh
+===================================================================
+--- scripts/find-lang.sh.orig
++++ scripts/find-lang.sh
 @@ -28,10 +28,10 @@ the top of the tree containing the files
  PACKAGE_NAME is the %{name} of the package. This should also be
  the basename of the .mo files.  the output is written to
@@ -53,10 +55,8 @@
 +
  find $TOP_DIR -type f -o -type l|sed '
  s:'"$TOP_DIR"'::
--'"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
--'"$NO_ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) \1\2\3:
-+'"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) %doc \1\2\3:
-+'"$NO_ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) %doc \1\2\3:
+ '"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
+ '"$NO_ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) \1\2\3:
  s:^\([^%].*\)::
  s:%lang(C) ::
 -/^$/d' > $MO_NAME
diff --git a/langnoc.diff b/langnoc.diff
index 97cb9fa..a65341b 100644
--- a/langnoc.diff
+++ b/langnoc.diff
@@ -35,8 +35,8 @@
  		MO_NAME=${1}
  		shift
 @@ -117,27 +127,32 @@ s:'"$TOP_DIR"'::
- '"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) %doc \1\2\3:
- '"$NO_ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) %doc \1\2\3:
+ '"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
+ '"$NO_ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) \1\2\3:
  s:^\([^%].*\)::
 +'"$ONLY_C"'/%lang(C)/!d
 +'"$NO_C"'/%lang(C)/d
diff --git a/remove-translations.diff b/remove-translations.diff
index b7453e2..b3d8ab1 100644
--- a/remove-translations.diff
+++ b/remove-translations.diff
@@ -17,4 +17,4 @@
 +
  find $TOP_DIR -type f -o -type l|sed '
  s:'"$TOP_DIR"'::
- '"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) %doc \1\2\3:
+ '"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
diff --git a/rpm.changes b/rpm.changes
index a9eb82c..2f8a365 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Sep  6 11:16:29 UTC 2011 - vuntz@opensuse.org
+
+- Update findlang.diff: do not mark standard gettext translation
+  files as %doc.
+- Rebase langnoc.diff and remove-translations.diff appropriately
+  after this change..
+
 -------------------------------------------------------------------
 Wed Aug 24 12:40:05 UTC 2011 - meissner@novell.com