pool/rpm
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

update to rpm-4.9.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=93
This commit is contained in:
Michael Schröder
2011-05-16 16:07:44 +00:00
committed by Git OBS Bridge
parent 5d8f14209e
commit cebe6dd1a8
87 changed files with 1633 additions and 2481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
langnoc.diff
View File

@@ -1,6 +1,6 @@
--- ./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
--- ./macros.in.orig 2011-05-11 15:59:44.000000000 +0000
+++ ./macros.in 2011-05-11 16:45:30.000000000 +0000
@@ -1247,6 +1247,7 @@ EOF
# %files -f %{name}.lang
#
%find_lang %{_rpmconfigdir}/find-lang.sh %{buildroot}
@@ -8,8 +8,8 @@
# 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
--- ./scripts/find-lang.sh.orig 2011-05-11 14:53:34.000000000 +0000
+++ ./scripts/find-lang.sh 2011-05-11 16:45:30.000000000 +0000
@@ -62,6 +62,8 @@ MO=
MO_NAME=$NAME.lang
ALL_NAME=#
@@ -34,17 +34,15 @@
* )
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:
@@ -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:
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:
@@ -73,7 +71,7 @@
/^$/d' >> $MO_NAME_NEW
find $TOP_DIR -type f|sed '
@@ -154,6 +169,8 @@ s:'"$TOP_DIR"'::
@@ -145,6 +160,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:^[^%].*::
@@ -82,7 +80,7 @@
s:%lang(C) ::
/^$/d' >> $MO_NAME_NEW
@@ -166,6 +183,8 @@ s:'"$TOP_DIR"'::
@@ -157,6 +174,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:^\([^%].*\)::
@@ -91,7 +89,7 @@
s:%lang(C) ::
/^$/d' >> $MO_NAME_NEW
fi
@@ -179,6 +198,8 @@ s:'"$TOP_DIR"'::
@@ -170,6 +189,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:^\([^%].*\)::
@@ -100,7 +98,7 @@
s:%lang(C) ::
/^$/d' >> $MO_NAME_NEW
fi
@@ -191,6 +212,8 @@ s:'"$TOP_DIR"'::
@@ -182,6 +203,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:^[^%].*::
@@ -109,7 +107,7 @@
s:%lang(C) ::
/^$/d' >> $MO_NAME_NEW
@@ -199,6 +222,8 @@ s:'"$TOP_DIR"'::
@@ -190,6 +213,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:^\([^%].*\)::
@@ -118,7 +116,7 @@
s:%lang(C) ::
/^$/d' >> $MO_NAME_NEW
@@ -206,6 +231,8 @@ find $TOP_DIR -type f -o -type l|sed '
@@ -197,6 +222,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:^\([^%].*\)::