- update to rpm-4.13.0
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=378
This commit is contained in:
Git OBS Bridge
@@ -1,6 +1,6 @@
|
||||
--- ./scripts/find-lang.sh.orig 2012-03-20 08:07:25.000000000 +0000
|
||||
+++ ./scripts/find-lang.sh 2012-06-01 12:35:41.000000000 +0000
|
||||
@@ -28,10 +28,10 @@ the top of the tree containing the files
|
||||
--- ./scripts/find-lang.sh.orig 2016-10-13 07:12:21.467778490 +0000
|
||||
+++ ./scripts/find-lang.sh 2017-01-19 12:45:51.491544036 +0000
|
||||
@@ -30,11 +30,11 @@ 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
|
||||
PACKAGE_NAME.lang unless \$3 is given in which case output is written
|
||||
@@ -8,24 +8,26 @@
|
||||
+to \$3 (note that \$3 is appended to if given).
|
||||
Additional options:
|
||||
- --with-gnome find GNOME help files
|
||||
- --with-kde find KDE help files
|
||||
+ --without-gnome do not find GNOME help files
|
||||
--with-mate find MATE help files
|
||||
- --with-kde find KDE help files
|
||||
+ --without-kde do not find KDE help files
|
||||
--with-qt find Qt translation files
|
||||
--with-html find HTML files
|
||||
--with-man find localized man pages
|
||||
--all-name match all package/domain names
|
||||
@@ -54,8 +54,8 @@ else NAME=$1
|
||||
@@ -58,9 +58,9 @@ else NAME=$1
|
||||
fi
|
||||
shift
|
||||
|
||||
-GNOME=#
|
||||
-KDE=#
|
||||
+GNOME=
|
||||
MATE=#
|
||||
-KDE=#
|
||||
+KDE=
|
||||
QT=#
|
||||
MAN=#
|
||||
MO=
|
||||
@@ -73,6 +73,14 @@ while test $# -gt 0 ; do
|
||||
HTML=#
|
||||
@@ -83,6 +83,14 @@ while test $# -gt 0 ; do
|
||||
KDE=
|
||||
shift
|
||||
;;
|
||||
@@ -40,7 +42,7 @@
|
||||
--with-qt )
|
||||
QT=
|
||||
shift
|
||||
@@ -97,13 +105,19 @@ while test $# -gt 0 ; do
|
||||
@@ -111,13 +119,19 @@ while test $# -gt 0 ; do
|
||||
esac
|
||||
done
|
||||
|
||||
@@ -61,7 +63,7 @@
|
||||
|
||||
find "$TOP_DIR" -type d|sed '
|
||||
s:'"$TOP_DIR"'::
|
||||
@@ -111,27 +125,27 @@ s:'"$TOP_DIR"'::
|
||||
@@ -125,27 +139,27 @@ s:'"$TOP_DIR"'::
|
||||
'"$ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/_]\+\)\([^/]*\)\(/[a-zA-Z0-9.\_\-]\+\)$:%lang(\2) %doc \1\2\3\4/:
|
||||
s:^\([^%].*\)::
|
||||
s:%lang(C) ::
|
||||
@@ -96,16 +98,39 @@
|
||||
|
||||
find "$TOP_DIR" -type f|sed '
|
||||
s:'"$TOP_DIR"'::
|
||||
@@ -139,7 +153,7 @@ s:'"$TOP_DIR"'::
|
||||
@@ -153,7 +167,7 @@ s:'"$TOP_DIR"'::
|
||||
'"$ALL_NAME$GNOME"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+-\([^/.]\+\)\.omf\):%lang(\2) \1:
|
||||
s:^[^%].*::
|
||||
s:%lang(C) ::
|
||||
-/^$/d' >> $MO_NAME
|
||||
+/^$/d' >> $MO_NAME_NEW
|
||||
|
||||
find $TOP_DIR -type d|sed '
|
||||
s:'"$TOP_DIR"'::
|
||||
@@ -162,11 +176,11 @@ s:'"$TOP_DIR"'::
|
||||
'"$NO_ALL_NAME$MATE"'s:\(.*/mate/help/'"$NAME"'\/\)\([^/_]\+\):%lang(\2) \1\2:
|
||||
'"$ALL_NAME$MATE"'s:\(.*/mate/help/[a-zA-Z0-9.\_\-]\+$\):%dir \1:
|
||||
'"$ALL_NAME$MATE"'s:\(.*/mate/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]/.\+\)::
|
||||
-'"$ALL_NAME$GNOME"'s:\(.*/mate/help/[a-zA-Z0-9.\_\-]\+\/\)\([^/_]\+\):%lang(\2) \1\2:
|
||||
+'"$ALL_NAME$MATE"'s:\(.*/mate/help/[a-zA-Z0-9.\_\-]\+\/\)\([^/_]\+\):%lang(\2) \1\2:
|
||||
s:%lang(.*) .*/mate/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*::
|
||||
s:^\([^%].*\)::
|
||||
s:%lang(C) ::
|
||||
-/^$/d' >> $MO_NAME
|
||||
+/^$/d' >> $MO_NAME_NEW
|
||||
|
||||
find "$TOP_DIR" -type d|sed '
|
||||
s:'"$TOP_DIR"'::
|
||||
@@ -181,7 +195,7 @@ s:'"$TOP_DIR"'::
|
||||
'"$ALL_NAME$MATE"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+-\([^/.]\+\)\.omf\):%lang(\2) \1:
|
||||
s:^[^%].*::
|
||||
s:%lang(C) ::
|
||||
-/^$/d' >> $MO_NAME
|
||||
+/^$/d' >> $MO_NAME_NEW
|
||||
|
||||
KDE3_HTML=`kde-config --expandvars --install html 2>/dev/null`
|
||||
if [ x"$KDE3_HTML" != x -a -d "$TOP_DIR$KDE3_HTML" ]; then
|
||||
@@ -151,7 +165,7 @@ s:'"$TOP_DIR"'::
|
||||
@@ -193,7 +207,7 @@ s:'"$TOP_DIR"'::
|
||||
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
|
||||
s:^\([^%].*\)::
|
||||
s:%lang(C) ::
|
||||
@@ -114,7 +139,7 @@
|
||||
fi
|
||||
|
||||
KDE4_HTML=`kde4-config --expandvars --install html 2>/dev/null`
|
||||
@@ -164,7 +178,7 @@ s:'"$TOP_DIR"'::
|
||||
@@ -206,7 +220,7 @@ s:'"$TOP_DIR"'::
|
||||
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
|
||||
s:^\([^%].*\)::
|
||||
s:%lang(C) ::
|
||||
@@ -122,8 +147,17 @@
|
||||
+/^$/d' >> $MO_NAME_NEW
|
||||
fi
|
||||
|
||||
find "$TOP_DIR" -type d|sed '
|
||||
@@ -217,7 +231,7 @@ s:'"$TOP_DIR"'::
|
||||
'"$ALL_NAME$HTML"'s:\(.*/doc/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
|
||||
s:^\([^%].*\)::
|
||||
s:%lang(C) ::
|
||||
-/^$/d' >> $MO_NAME
|
||||
+/^$/d' >> $MO_NAME_NEW
|
||||
|
||||
find "$TOP_DIR" -type f -o -type l|sed '
|
||||
@@ -176,7 +190,7 @@ s:'"$TOP_DIR"'::
|
||||
s:'"$TOP_DIR"'::
|
||||
@@ -228,7 +242,7 @@ s:'"$TOP_DIR"'::
|
||||
'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
|
||||
s:^[^%].*::
|
||||
s:%lang(C) ::
|
||||
@@ -132,14 +166,14 @@
|
||||
|
||||
find "$TOP_DIR" -type d|sed '
|
||||
s:'"$TOP_DIR"'::
|
||||
@@ -184,17 +198,22 @@ s:'"$TOP_DIR"'::
|
||||
@@ -236,17 +250,22 @@ s:'"$TOP_DIR"'::
|
||||
'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1*:
|
||||
s:^\([^%].*\)::
|
||||
s:%lang(C) ::
|
||||
-/^$/d' >> $MO_NAME
|
||||
+/^$/d' >> $MO_NAME_NEW
|
||||
|
||||
find "$TOP_DIR" -type f -o -type l|sed '
|
||||
find "$TOP_DIR" -type f -o -type l|sed -r 's/\.(bz2|gz|xz|lzma|Z)$//g' | sed '
|
||||
s:'"$TOP_DIR"'::
|
||||
'"$NO_ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/'"$NAME"'\.[a-z0-9].*\):%lang(\2) \1*:
|
||||
s:^\([^%].*\)::
|
||||
|
||||
Reference in New Issue
Block a user