Hello community, here is the log from the commit of package kf5-filesystem for openSUSE:Factory checked in at 2017-12-15 14:00:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf5-filesystem (Old) and /work/SRC/openSUSE:Factory/.kf5-filesystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf5-filesystem" Fri Dec 15 14:00:06 2017 rev:21 rq:556434 version:20170414 Changes: -------- --- /work/SRC/openSUSE:Factory/kf5-filesystem/kf5-filesystem.changes 2017-05-08 18:44:27.285482400 +0200 +++ /work/SRC/openSUSE:Factory/.kf5-filesystem.new/kf5-filesystem.changes 2017-12-15 14:00:11.871641855 +0100 @@ -1,0 +2,7 @@ +Tue Dec 12 08:28:15 UTC 2017 - [email protected] + +- Properly escape some % +- Remove en docs from an existing .lang file in %kf5_find_lang + to fix conflicts with rpm 4.14's find_lang.sh + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ macros.kf5 ++++++ --- /var/tmp/diff_new_pack.ifcFRS/_old 2017-12-15 14:00:13.103582384 +0100 +++ /var/tmp/diff_new_pack.ifcFRS/_new 2017-12-15 14:00:13.107582191 +0100 @@ -163,8 +163,8 @@ \ find "%{buildroot}" -type f -o -type l|sed ' \ s:'"%{buildroot}"':: \ -s:\\(.*/locale/kf5/\\)\\([^/_]\\+\\)\\([^/]*\\)\\(.*\\.mo$\\):%dir %lang(\\2) \\1\\2\\3\\n%dir %lang(\\2) \\1\\2\\3/LC_MESSAGES\\n%lang(\\2) \\1\\2\\3\\4: \ -s:\\(.*/locale/kf5/\\)\\([^/_]\\+\\)\\(/[^/]*\\)\\(/[^/]*\\)\\(/[^/]*\\.js$\\):%dir %lang(\\2) \\1\\2\\n%dir %lang(\\2) \\1\\2\\3\\n%dir %lang(\\2) \\1\\2\\3\\4\\n%lang(\\2) \\1\\2\\3\\4\\5: \ +s:\\(.*/locale/kf5/\\)\\([^/_]\\+\\)\\([^/]*\\)\\(.*\\.mo$\\):%%dir %%lang(\\2) \\1\\2\\3\\n%%dir %%lang(\\2) \\1\\2\\3/LC_MESSAGES\\n%%lang(\\2) \\1\\2\\3\\4: \ +s:\\(.*/locale/kf5/\\)\\([^/_]\\+\\)\\(/[^/]*\\)\\(/[^/]*\\)\\(/[^/]*\\.js$\\):%%dir %%lang(\\2) \\1\\2\\n%%dir %%lang(\\2) \\1\\2\\3\\n%%dir %%lang(\\2) \\1\\2\\3\\4\\n%%lang(\\2) \\1\\2\\3\\4\\5: \ s:^\\([^%].*\\):: \ /^$/d' \ > $MO_NAME_NEW \ if ! grep -q / $MO_NAME_NEW; then \ @@ -176,6 +176,9 @@ rm -f $MO_NAME_NEW %kf5_find_htmldocs() \ +# rpm 4.14's find_lang.sh added support for those docs, but we do it ourselves \ +# to stay backwards-compatible and keep the en docs in the main package \ +sed -i'' '\\#%{_kf5_htmldir}#d' %{name}.lang \ CURDIR=`pwd` \ pushd %{buildroot}%{_kf5_htmldir} \ for i in *; do \ @@ -183,7 +186,7 @@ echo "Removing unsupported translation %{_kf5_htmldir}/${i}" \ rm -rf "$i" \ elif [ "$i" != "en" ]; then \ - echo "%doc %lang($i) %{_kf5_htmldir}/${i}" >> $CURDIR/%{name}.lang \ + echo "%%doc %%lang($i) %{_kf5_htmldir}/${i}" >> $CURDIR/%{name}.lang \ fi \ done \ popd
