Accepting request 82425 from Base:System

Do not mark .mo files as %doc (forwarded request 81142 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/82425
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=158

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

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

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:

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