Michael Schröder
b17f4ab75c
add %no_lang_C macro to allow compatible builds [bnc#449847] OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=70
130 lines
4.1 KiB
Diff
130 lines
4.1 KiB
Diff
--- ./macros.in.orig 2010-10-28 13:57:37.000000000 +0000
|
|
+++ ./macros.in 2010-10-29 12:35:39.000000000 +0000
|
|
@@ -1381,6 +1381,7 @@ EOF
|
|
# %files -f %{name}.lang
|
|
#
|
|
%find_lang %{_rpmconfigdir}/find-lang.sh %{buildroot}
|
|
+%no_lang_C --without-C
|
|
|
|
# Commands + opts to use for retrieving remote files
|
|
# Proxy opts can be set through --httpproxy/--httpport popt aliases,
|
|
--- ./scripts/find-lang.sh.orig 2010-10-28 13:44:49.000000000 +0000
|
|
+++ ./scripts/find-lang.sh 2010-10-29 09:39:22.000000000 +0000
|
|
@@ -62,6 +62,8 @@ MO=
|
|
MO_NAME=$NAME.lang
|
|
ALL_NAME=#
|
|
NO_ALL_NAME=
|
|
+ONLY_C=#
|
|
+NO_C=#
|
|
|
|
while test $# -gt 0 ; do
|
|
case "${1}" in
|
|
@@ -98,6 +100,14 @@ while test $# -gt 0 ; do
|
|
NO_ALL_NAME=#
|
|
shift
|
|
;;
|
|
+ --with-only-C )
|
|
+ ONLY_C=
|
|
+ shift
|
|
+ ;;
|
|
+ --without-C )
|
|
+ NO_C=
|
|
+ shift
|
|
+ ;;
|
|
* )
|
|
MO_NAME=${1}
|
|
shift
|
|
@@ -117,6 +127,8 @@ s:'"$TOP_DIR"'::
|
|
'"$ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
|
|
'"$NO_ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) \1\2\3:
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
@@ -131,22 +143,25 @@ s:%lang(C) ::
|
|
|
|
find $TOP_DIR -type d|sed '
|
|
s:'"$TOP_DIR"'::
|
|
-'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir %doc \1:
|
|
+'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%lang(C) %dir %doc \1:
|
|
'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+\)::
|
|
'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/_]\+\):%lang(\2) %doc \1\2:
|
|
-'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+$\):%dir %doc \1:
|
|
+'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+$\):%lang(C) %dir %doc \1:
|
|
'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]/.\+\)::
|
|
'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+\/\)\([^/_]\+\):%lang(\2) %doc \1\2:
|
|
s:%lang(.*) .*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*::
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
find $TOP_DIR -type d|sed '
|
|
s:'"$TOP_DIR"'::
|
|
-'"$NO_ALL_NAME$GNOME"'s:\(.*/omf/'"$NAME"'$\):%dir \1:
|
|
-'"$ALL_NAME$GNOME"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+$\):%dir \1:
|
|
+'"$NO_ALL_NAME$GNOME"'s:\(.*/omf/'"$NAME"'$\):%lang(C) %dir \1:
|
|
+'"$ALL_NAME$GNOME"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+$\):%lang(C) %dir \1:
|
|
s:^\([^%].*\)::
|
|
+s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
find $TOP_DIR -type f|sed '
|
|
@@ -154,6 +169,8 @@ s:'"$TOP_DIR"'::
|
|
'"$NO_ALL_NAME$GNOME"'s:\(.*/omf/'"$NAME"'/'"$NAME"'-\([^/.]\+\)\.omf\):%lang(\2) \1:
|
|
'"$ALL_NAME$GNOME"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+-\([^/.]\+\)\.omf\):%lang(\2) \1:
|
|
s:^[^%].*::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
@@ -166,6 +183,8 @@ s:'"$TOP_DIR"'::
|
|
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
|
|
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
fi
|
|
@@ -179,6 +198,8 @@ s:'"$TOP_DIR"'::
|
|
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
|
|
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
fi
|
|
@@ -191,6 +212,8 @@ s:'"$TOP_DIR"'::
|
|
'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}_[a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
|
|
'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
|
|
s:^[^%].*::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
@@ -199,6 +222,8 @@ s:'"$TOP_DIR"'::
|
|
'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/\)::
|
|
'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1*:
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
@@ -206,6 +231,8 @@ find $TOP_DIR -type f -o -type l|sed '
|
|
s:'"$TOP_DIR"'::
|
|
'"$NO_ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/'"$NAME"'\.[a-z0-9].*\):%lang(\2) \1*:
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|