- update to rpm-4.14.1

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=434

langnoc.diff

@@ -1,6 +1,6 @@
---- ./macros.in.orig	2012-06-01 14:10:18.000000000 +0000
-+++ ./macros.in	2012-06-01 14:10:29.000000000 +0000
-@@ -1204,6 +1204,7 @@ EOF
+--- ./macros.in.orig	2018-01-31 13:35:52.735593230 +0000
++++ ./macros.in	2018-01-31 13:35:55.528585772 +0000
+@@ -1351,6 +1351,7 @@ EOF
  # %files -f %{name}.lang
  #
  %find_lang	%{_rpmconfigdir}/find-lang.sh %{buildroot}
@@ -8,18 +8,18 @@
  
  # Commands + opts to use for retrieving remote files
  # Proxy opts can be set through --httpproxy/--httpport popt aliases,
---- ./scripts/find-lang.sh.orig	2012-06-01 14:10:18.000000000 +0000
-+++ ./scripts/find-lang.sh	2012-06-01 14:14:47.000000000 +0000
-@@ -62,6 +62,8 @@ MO=
- MO_NAME=$NAME.lang
+--- ./scripts/find-lang.sh.orig	2018-01-31 13:35:52.726593254 +0000
++++ ./scripts/find-lang.sh	2018-01-31 13:36:35.806478195 +0000
+@@ -60,6 +60,8 @@ MO=
+ MO_NAME=${NAMES[0]}.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
+ 	--with-gnome )
+@@ -103,6 +105,14 @@ while test $# -gt 0 ; do
  		NO_ALL_NAME=#
  		shift
  		;;
@@ -32,18 +32,18 @@
 +		shift
 +		;;
  	* )
- 		MO_NAME=${1}
- 		shift
-@@ -133,6 +143,8 @@ s:'"$TOP_DIR"'::
+ 		if [ $MO_NAME != ${NAMES[$#]}.lang ]; then
+ 		    NAMES[${#NAMES[@]}]=$MO_NAME
+@@ -143,6 +153,8 @@ 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:
  s:^\([^%].*\)::
 +'"$ONLY_C"'/%lang(C)/!d
 +'"$NO_C"'/%lang(C)/d
  s:%lang(C) ::
- /^$/d' > $MO_NAME_NEW
+ /^$/d' >> $MO_NAME_NEW
  
-@@ -141,19 +153,23 @@ s:'"$TOP_DIR"'::
+@@ -151,19 +163,23 @@ s:'"$TOP_DIR"'::
  '"$NO_ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/_]\+\)\([^/]*\)\(/'"$NAME"'\)$:%lang(\2) %doc \1\2\3\4/:
  '"$ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/_]\+\)\([^/]*\)\(/[a-zA-Z0-9.\_\-]\+\)$:%lang(\2) %doc \1\2\3\4/:
  s:^\([^%].*\)::
@@ -69,7 +69,7 @@
  s:%lang(C) ::
  /^$/d' >> $MO_NAME_NEW
  
-@@ -169,6 +185,8 @@ s:'"$TOP_DIR"'::
+@@ -179,6 +195,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:^[^%].*::
@@ -78,7 +78,7 @@
  s:%lang(C) ::
  /^$/d' >> $MO_NAME_NEW
  
-@@ -181,6 +199,8 @@ s:'"$TOP_DIR"'::
+@@ -219,6 +237,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:^\([^%].*\)::
@@ -87,7 +87,7 @@
  s:%lang(C) ::
  /^$/d' >> $MO_NAME_NEW
  fi
-@@ -194,6 +214,8 @@ s:'"$TOP_DIR"'::
+@@ -232,6 +252,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:^\([^%].*\)::
@@ -96,7 +96,7 @@
  s:%lang(C) ::
  /^$/d' >> $MO_NAME_NEW
  fi
-@@ -206,6 +228,8 @@ s:'"$TOP_DIR"'::
+@@ -269,6 +291,8 @@ s:'"$TOP_DIR"'::
  '"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
  '"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
  s:^[^%].*::
@@ -105,7 +105,7 @@
  s:%lang(C) ::
  /^$/d' >> $MO_NAME_NEW
  
-@@ -214,6 +238,8 @@ s:'"$TOP_DIR"'::
+@@ -277,6 +301,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:^\([^%].*\)::
@@ -114,7 +114,7 @@
  s:%lang(C) ::
  /^$/d' >> $MO_NAME_NEW
  
-@@ -221,6 +247,8 @@ find "$TOP_DIR" -type f -o -type l|sed '
+@@ -284,6 +310,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:^\([^%].*\)::