From b17f4ab75ce0fa8483528be54402283d0dd10997b3ddd98a0f682052287f8cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 29 Oct 2010 13:10:19 +0000 Subject: [PATCH] - add support --with-only-C and --without-C options to find-lang.sh, 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 --- langnoc.diff | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++ rpm.changes | 6 +++ rpm.spec | 3 +- 3 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 langnoc.diff diff --git a/langnoc.diff b/langnoc.diff new file mode 100644 index 0000000..e069a54 --- /dev/null +++ b/langnoc.diff @@ -0,0 +1,129 @@ +--- ./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 + diff --git a/rpm.changes b/rpm.changes index 96de78b..2d32185 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 29 15:03:50 CEST 2010 - mls@suse.de + +- add support --with-only-C and --without-C options to find-lang.sh, + add %no_lang_C macro to allow compatible builds [bnc#449847] + ------------------------------------------------------------------- Mon Oct 4 17:34:52 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/rpm.spec b/rpm.spec index cfd1814..f982907 100644 --- a/rpm.spec +++ b/rpm.spec @@ -117,6 +117,7 @@ Patch79: nosignature.diff Patch80: fixsbits.diff Patch81: pkgconfig-0.24.diff Patch82: rpm-gst-provides.patch +Patch83: langnoc.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -178,7 +179,7 @@ rm -f rpmdb/db.h %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 -%patch -P 80 -P 81 -P 82 +%patch -P 80 -P 81 -P 82 -P 83 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov