Hello community,

here is the log from the commit of package rpm for openSUSE:Factory checked in 
at 2018-02-08 14:02:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
 and      /work/SRC/openSUSE:Factory/.rpm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rpm"

Thu Feb  8 14:02:25 2018 rev:256 rq:573718 version:4.14.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/rpm/python-rpm.changes   2018-01-13 
21:33:15.166354674 +0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/python-rpm.changes      2018-02-08 
14:02:27.548198952 +0100
@@ -1,0 +2,5 @@
+Wed Jan 31 14:45:33 CET 2018 - m...@suse.de
+
+- update to rpm-4.14.1
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes  2018-01-26 13:34:17.371895160 
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes     2018-02-08 
14:02:31.596009956 +0100
@@ -1,0 +2,28 @@
+Wed Feb  7 09:13:41 UTC 2018 - dims...@opensuse.org
+
+- Update %remove_and_set: This macro needs no fallback to
+  /var/adm/fillup-templates, as it does not work on files provided
+  by the packages, but rather constructs temporary files inside
+  fillup_dir.
+
+-------------------------------------------------------------------
+Mon Feb  5 11:08:12 CET 2018 - m...@suse.de
+
+- remove shebang from python-macro-helper
+
+-------------------------------------------------------------------
+Wed Jan 31 14:45:33 CET 2018 - m...@suse.de
+
+- update to rpm-4.14.1
+  * Fix arbitrary code execution when evaluating common
+    python-related macros
+  * new artifact file marker
+  * less strict signature header verification [bnc#1078284]
+- dropped patches:
+  * bigarchive.diff
+  * editdwarf.diff
+  * hardlink.diff
+  * rofs.diff
+  * transfiletriggerpostun.diff
+
+-------------------------------------------------------------------

Old:
----
  bigarchive.diff
  editdwarf.diff
  hardlink.diff
  rofs.diff
  rpm-4.14.0.tar.bz2
  transfiletriggerpostun.diff

New:
----
  rpm-4.14.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-rpm.spec ++++++
--- /var/tmp/diff_new_pack.wLBLVV/_old  2018-02-08 14:02:34.007897343 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new  2018-02-08 14:02:34.011897157 +0100
@@ -18,7 +18,7 @@
 
 
 Name:           python-rpm
-Version:        4.14.0
+Version:        4.14.1
 Release:        0
 #!BuildIgnore:  rpmlint-Factory
 Summary:        Python Bindings for Manipulating RPM Packages

++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.wLBLVV/_old  2018-02-08 14:02:34.047895475 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new  2018-02-08 14:02:34.047895475 +0100
@@ -51,7 +51,7 @@
 Summary:        The RPM Package Manager
 License:        GPL-2.0+
 Group:          System/Packages
-Version:        4.14.0
+Version:        4.14.1
 Release:        0
 Source:         http://ftp.rpm.org/releases/rpm-4.14.x/rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
@@ -127,13 +127,8 @@
 Patch100:       rpm-findlang-inject-metainfo.patch
 Patch102:       emptymanifest.diff
 Patch103:       find-lang-qt-qm.patch
-Patch104:       editdwarf.diff
-Patch105:       rofs.diff
-Patch106:       transfiletriggerpostun.diff
-Patch107:       hardlink.diff
 Patch108:       debugedit-macro.diff
 Patch109:       pythondistdeps.diff
-Patch110:       bigarchive.diff
 Patch111:       debugedit-bnc1076819.diff
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -230,8 +225,8 @@
 %patch -P 70 -P 71       -P 73 -P 74 -P 75       -P 77 -P 78
 %patch                               -P 85
 %patch                   -P 93 -P 94                         -P 99
-%patch -P 100        -P 102 -P 103 -P 104 -P 105 -P 106 -P 107 -P 108
-%patch -P 109 -P 110 -P 111
+%patch -P 100        -P 102 -P 103                             -P 108
+%patch -P 109 -P 111
 
 %ifarch aarch64 ppc64le
 %patch6464

++++++ brpcompress.diff ++++++
--- /var/tmp/diff_new_pack.wLBLVV/_old  2018-02-08 14:02:34.119892114 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new  2018-02-08 14:02:34.123891927 +0100
@@ -1,5 +1,5 @@
---- ./scripts/brp-compress.orig        2017-01-19 12:14:04.529812394 +0000
-+++ ./scripts/brp-compress     2017-01-19 12:18:22.488107819 +0000
+--- ./scripts/brp-compress.orig        2018-01-31 13:07:37.130104408 +0000
++++ ./scripts/brp-compress     2018-01-31 13:07:16.234159981 +0000
 @@ -5,51 +5,78 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD
        exit 0
  fi
@@ -40,7 +40,7 @@
  for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \
        ./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \
        ./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \
-       ./usr/share/doc/*/man/man* ./usr/lib/*/man/man*
+       ./usr/share/doc/*/man/man* ./usr/lib/*/man/man* 
./usr/share/fish/man/man*
  do
      [ -d $d ] || continue
 -    for f in `find $d -type f ! -name dir`

++++++ findksyms.diff ++++++
--- /var/tmp/diff_new_pack.wLBLVV/_old  2018-02-08 14:02:34.191888753 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new  2018-02-08 14:02:34.191888753 +0100
@@ -1,6 +1,6 @@
---- ./scripts/Makefile.am.orig 2017-12-01 14:48:23.171746842 +0000
-+++ ./scripts/Makefile.am      2017-12-01 14:49:09.395612962 +0000
-@@ -18,6 +18,7 @@ EXTRA_DIST = \
+--- ./scripts/Makefile.am.orig 2018-01-31 13:08:32.644956731 +0000
++++ ./scripts/Makefile.am      2018-01-31 13:09:24.081819852 +0000
+@@ -19,6 +19,7 @@ EXTRA_DIST = \
        tgpg vpkg-provides.sh \
        find-requires find-provides \
        find-requires.php find-provides.php \
@@ -8,16 +8,16 @@
        mono-find-requires mono-find-provides \
        ocaml-find-requires.sh ocaml-find-provides.sh \
        pkgconfigdeps.sh libtooldeps.sh metainfo.prov \
-@@ -34,6 +35,7 @@ rpmconfig_SCRIPTS = \
-       debuginfo.prov \
+@@ -36,6 +37,7 @@ rpmconfig_SCRIPTS = \
        find-lang.sh find-requires find-provides \
        perl.prov perl.req pythondeps.sh pythondistdeps.py \
+       python-macro-helper \
 +      find-requires.ksyms find-provides.ksyms \
        metainfo.prov \
        mono-find-requires mono-find-provides \
        pkgconfigdeps.sh libtooldeps.sh \
---- ./scripts/find-provides.ksyms.orig 2017-12-01 14:48:28.374731785 +0000
-+++ ./scripts/find-provides.ksyms      2017-12-01 14:48:28.374731785 +0000
+--- ./scripts/find-provides.ksyms.orig 2018-01-31 13:08:40.820934977 +0000
++++ ./scripts/find-provides.ksyms      2018-01-31 13:08:40.820934977 +0000
 @@ -0,0 +1,60 @@
 +#! /bin/bash
 +
@@ -79,8 +79,8 @@
 +    | sed -r -ne "s/^0*([0-9a-f]+) A __crc_(.+)/ksym($flavor:\\2) = \\1/p"
 +done \
 +| sort -u
---- ./scripts/find-requires.ksyms.orig 2017-12-01 14:48:28.375731781 +0000
-+++ ./scripts/find-requires.ksyms      2017-12-01 14:48:28.375731781 +0000
+--- ./scripts/find-requires.ksyms.orig 2018-01-31 13:08:40.821934974 +0000
++++ ./scripts/find-requires.ksyms      2018-01-31 13:08:40.820934977 +0000
 @@ -0,0 +1,29 @@
 +#! /bin/bash
 +

++++++ findlang.diff ++++++
--- /var/tmp/diff_new_pack.wLBLVV/_old  2018-02-08 14:02:34.211887818 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new  2018-02-08 14:02:34.215887632 +0100
@@ -1,6 +1,6 @@
---- ./scripts/find-lang.sh.orig        2017-10-05 10:04:57.586602035 +0000
-+++ ./scripts/find-lang.sh     2017-12-01 14:51:31.189202268 +0000
-@@ -30,11 +30,11 @@ the top of the tree containing the files
+--- ./scripts/find-lang.sh.orig        2018-01-16 09:02:23.879253043 +0000
++++ ./scripts/find-lang.sh     2018-01-31 13:20:30.938048419 +0000
+@@ -22,11 +22,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
@@ -15,7 +15,7 @@
    --with-qt           find Qt translation files
    --with-html         find HTML files
    --with-man          find localized man pages
-@@ -58,9 +58,9 @@ else NAME=$1
+@@ -50,9 +50,9 @@ else NAMES[0]=$1
  fi
  shift
  
@@ -27,7 +27,7 @@
  QT=#
  MAN=#
  HTML=#
-@@ -83,6 +83,14 @@ while test $# -gt 0 ; do
+@@ -74,6 +74,14 @@ while test $# -gt 0 ; do
                KDE=
                shift
                ;;
@@ -42,28 +42,33 @@
        --with-qt )
                QT=
                shift
-@@ -111,13 +119,19 @@ while test $# -gt 0 ; do
+@@ -103,11 +111,13 @@ while test $# -gt 0 ; do
+               shift
+               ;;
      esac
- done    
+-done    
++done
  
+-if [ -f $MO_NAME ]; then
+-    rm $MO_NAME
 +if ! test -s $MO_NAME ; then
 +      echo "%defattr (644, root, root, 755)" > $MO_NAME
-+fi
+ fi
 +MO_NAME_NEW=$MO_NAME.tmp.$$
 +rm -f $MO_NAME_NEW
-+
- find "$TOP_DIR" -type f -o -type l|sed '
- s:'"$TOP_DIR"'::
- '"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
+ 
+ for NAME in ${NAMES[@]}; do
+ 
+@@ -117,7 +127,7 @@ s:'"$TOP_DIR"'::
  '"$NO_ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) 
\1\2\3:
  s:^\([^%].*\)::
  s:%lang(C) ::
--/^$/d' > $MO_NAME
-+/^$/d' > $MO_NAME_NEW
+-/^$/d' >> $MO_NAME
++/^$/d' >> $MO_NAME_NEW
  
  find "$TOP_DIR" -type d|sed '
  s:'"$TOP_DIR"'::
-@@ -125,27 +139,27 @@ s:'"$TOP_DIR"'::
+@@ -125,27 +135,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) ::
@@ -98,7 +103,7 @@
  
  find "$TOP_DIR" -type f|sed '
  s:'"$TOP_DIR"'::
-@@ -153,7 +167,7 @@ s:'"$TOP_DIR"'::
+@@ -153,7 +163,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) ::
@@ -107,7 +112,7 @@
  
  find $TOP_DIR -type d|sed '
  s:'"$TOP_DIR"'::
-@@ -166,14 +180,14 @@ s:'"$TOP_DIR"'::
+@@ -166,14 +176,14 @@ s:'"$TOP_DIR"'::
  s:%lang(.*) .*/mate/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*::
  s:^\([^%].*\)::
  s:%lang(C) ::
@@ -124,7 +129,7 @@
  
  find "$TOP_DIR" -type f|sed '
  s:'"$TOP_DIR"'::
-@@ -181,7 +195,7 @@ s:'"$TOP_DIR"'::
+@@ -181,7 +191,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) ::
@@ -133,7 +138,7 @@
  
  KDE3_HTML=`kde-config --expandvars --install html 2>/dev/null`
  if [ x"$KDE3_HTML" != x -a -d "$TOP_DIR$KDE3_HTML" ]; then
-@@ -193,7 +207,7 @@ s:'"$TOP_DIR"'::
+@@ -193,7 +203,7 @@ s:'"$TOP_DIR"'::
  
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) 
\1\2\3:
  s:^\([^%].*\)::
  s:%lang(C) ::
@@ -142,7 +147,7 @@
  fi
  
  KDE4_HTML=`kde4-config --expandvars --install html 2>/dev/null`
-@@ -206,7 +220,7 @@ s:'"$TOP_DIR"'::
+@@ -206,7 +216,7 @@ s:'"$TOP_DIR"'::
  
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) 
\1\2\3:
  s:^\([^%].*\)::
  s:%lang(C) ::
@@ -151,7 +156,7 @@
  fi
  
  KF5_HTML=`kf5-config --expandvars --install html 2>/dev/null`
-@@ -219,7 +233,7 @@ s:'"$TOP_DIR"'::
+@@ -219,7 +229,7 @@ s:'"$TOP_DIR"'::
  
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) 
\1\2\3:
  s:^\([^%].*\)::
  s:%lang(C) ::
@@ -160,7 +165,7 @@
  fi
  
  find "$TOP_DIR" -type d|sed '
-@@ -230,7 +244,7 @@ s:'"$TOP_DIR"'::
+@@ -230,7 +240,7 @@ s:'"$TOP_DIR"'::
  
'"$ALL_NAME$HTML"'s:\(.*/doc/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2)
 \1\2\3:
  s:^\([^%].*\)::
  s:%lang(C) ::
@@ -169,7 +174,7 @@
  
  find "$TOP_DIR" -type f -o -type l|sed '
  s:'"$TOP_DIR"'::
-@@ -243,7 +257,7 @@ s:'"$TOP_DIR"'::
+@@ -243,7 +253,7 @@ s:'"$TOP_DIR"'::
  '"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
  s:^[^%].*::
  s:%lang(C) ::
@@ -178,7 +183,7 @@
  
  find "$TOP_DIR" -type d|sed '
  s:'"$TOP_DIR"'::
-@@ -251,17 +265,22 @@ s:'"$TOP_DIR"'::
+@@ -251,19 +261,24 @@ s:'"$TOP_DIR"'::
  '"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1*:
  s:^\([^%].*\)::
  s:%lang(C) ::
@@ -193,9 +198,12 @@
 -/^$/d' >> $MO_NAME
 +/^$/d' >> $MO_NAME_NEW
  
+ done # for NAME in ${NAMES[@]}
+ 
 -if ! grep -q / $MO_NAME; then
+-      echo "No translations found for ${NAME} in ${TOP_DIR}"
 +if ! grep -q / $MO_NAME_NEW; then
-       echo "No translations found for ${NAME} in ${TOP_DIR}"
++      echo "No translations found for ${NAMES[*]} in ${TOP_DIR}"
 +      rm -f $MO_NAME_NEW
        exit 1
  fi

++++++ langnoc.diff ++++++
--- /var/tmp/diff_new_pack.wLBLVV/_old  2018-02-08 14:02:34.251885951 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new  2018-02-08 14:02:34.251885951 +0100
@@ -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:^\([^%].*\)::

++++++ pythondistdeps.diff ++++++
--- /var/tmp/diff_new_pack.wLBLVV/_old  2018-02-08 14:02:34.299883710 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new  2018-02-08 14:02:34.299883710 +0100
@@ -1,5 +1,12 @@
---- ./scripts/pythondistdeps.py.orig   2018-01-02 10:03:28.273247676 +0000
-+++ ./scripts/pythondistdeps.py        2018-01-02 10:03:41.527207759 +0000
+--- ./scripts/python-macro-helper.orig 2018-02-05 10:06:51.837690381 +0000
++++ ./scripts/python-macro-helper      2018-02-05 10:07:22.500594058 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python -Es
+ 
+ from distutils.sysconfig import get_python_lib
+ from platform import python_version_tuple
+--- ./scripts/pythondistdeps.py.orig   2017-10-05 10:04:57.587602034 +0000
++++ ./scripts/pythondistdeps.py        2018-02-05 10:06:37.013736947 +0000
 @@ -1,4 +1,3 @@
 -#!/usr/bin/python
  # -*- coding: utf-8 -*-

++++++ remove-translations.diff ++++++
--- /var/tmp/diff_new_pack.wLBLVV/_old  2018-02-08 14:02:34.319882776 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new  2018-02-08 14:02:34.319882776 +0100
@@ -1,6 +1,6 @@
---- ./scripts/find-lang.sh.orig        2012-06-01 13:28:40.000000000 +0000
-+++ ./scripts/find-lang.sh     2012-06-01 13:30:43.000000000 +0000
-@@ -111,6 +111,23 @@ fi
+--- ./scripts/find-lang.sh.orig        2018-01-31 13:25:25.229266078 +0000
++++ ./scripts/find-lang.sh     2018-01-31 13:26:15.128133281 +0000
+@@ -119,6 +119,23 @@ fi
  MO_NAME_NEW=$MO_NAME.tmp.$$
  rm -f $MO_NAME_NEW
  
@@ -21,6 +21,6 @@
 +  fi
 +done
 +
+ for NAME in ${NAMES[@]}; do
+ 
  find "$TOP_DIR" -type f -o -type l|sed '
- s:'"$TOP_DIR"'::
- '"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:

++++++ rpm-4.14.0.tar.bz2 -> rpm-4.14.1.tar.bz2 ++++++
++++ 46973 lines of diff (skipped)

++++++ rpm-findlang-inject-metainfo.patch ++++++
--- /var/tmp/diff_new_pack.wLBLVV/_old  2018-02-08 14:02:36.715770911 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new  2018-02-08 14:02:36.715770911 +0100
@@ -1,15 +1,6 @@
---- ./scripts/find-lang.sh.orig        2017-01-19 13:48:53.548472521 +0000
-+++ ./scripts/find-lang.sh     2017-01-19 13:53:09.922690409 +0000
-@@ -11,6 +11,8 @@
- #in tact and are included with any redistribution of this file or any
- #work based on this file.
- 
-+# 2016-05-19 Dominique Leuenberger <dims...@suse.de>
-+#   * Add support to create a metainfo.xml for -lang packages
- # 2011-11-16 Per Øyvind Karlsen <peroyv...@mandriva.org>
- #   * add support for HTML files (from Mandriva)
- # 2004-06-20 Arkadiusz Miśkiewicz <ar...@pld-linux.org>
-@@ -41,6 +43,7 @@ Additional options:
+--- ./scripts/find-lang.sh.orig        2018-01-31 13:37:22.810352621 +0000
++++ ./scripts/find-lang.sh     2018-01-31 13:39:38.117990971 +0000
+@@ -32,6 +32,7 @@ Additional options:
    --with-man          find localized man pages
    --all-name          match all package/domain names
    --without-mo                do not find locale files
@@ -17,15 +8,15 @@
  EOF
  exit 1
  }
-@@ -72,6 +75,7 @@ ALL_NAME=#
+@@ -62,6 +63,7 @@ ALL_NAME=#
  NO_ALL_NAME=
  ONLY_C=#
  NO_C=#
 +METAINFO=#
- 
  while test $# -gt 0 ; do
      case "${1}" in
-@@ -128,6 +132,11 @@ while test $# -gt 0 ; do
+       --with-gnome )
+@@ -113,6 +115,11 @@ while test $# -gt 0 ; do
                NO_C=
                shift
                ;;
@@ -35,9 +26,9 @@
 +              shift 2
 +              ;;
        * )
-               MO_NAME=${1}
-               shift
-@@ -330,6 +339,24 @@ if ! grep -q / $MO_NAME_NEW; then
+               if [ $MO_NAME != ${NAMES[$#]}.lang ]; then
+                   NAMES[${#NAMES[@]}]=$MO_NAME
+@@ -323,6 +330,24 @@ if ! grep -q / $MO_NAME_NEW; then
        exit 1
  fi
  

++++++ rpm-suse_macros ++++++
--- /var/tmp/diff_new_pack.wLBLVV/_old  2018-02-08 14:02:36.747769416 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new  2018-02-08 14:02:36.747769416 +0100
@@ -199,10 +199,6 @@
     %{-n:PNAME=%{-n*}}%{!-n:PNAME=%{name}} \
     DEF_VAL=%{-y:"yes"}%{!-y:"no"} \
     DEL_TEMPL=%{_fillupdir}/$PNAME.del \
-    # If template not in new location, fallback to old location \
-    if [ ! -f $DEL_TEMPL ] ; then \
-        DEL_TEMPL=/var/adm/fillup-templates/$PNAME.del \
-    fi \
     rm -f $DEL_TEMPL \
     for var in %{?*} ; do \
        echo -e "#\\n$var=$DEF_VAL\\n" >> $DEL_TEMPL \


Reply via email to