Hello community,
here is the log from the commit of package bundle-lang-common for
openSUSE:Factory checked in at 2016-05-19 23:28:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bundle-lang-common (Old)
and /work/SRC/openSUSE:Factory/.bundle-lang-common.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bundle-lang-common"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-common.changes
2016-05-10 09:27:44.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-common.changes
2016-05-19 23:28:33.000000000 +0200
@@ -1,0 +2,11 @@
+Thu May 19 20:59:15 UTC 2016 - [email protected]
+
+- Improve build-time performance.
+
+-------------------------------------------------------------------
+Thu May 19 11:47:51 UTC 2016 - [email protected]
+
+- bundle.sh: filter out existing appdata files (metainfo.xml).
+- Update package list.
+
+-------------------------------------------------------------------
bundle-lang-gnome.changes: same change
bundle-lang-kde.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bundle-lang-common.spec ++++++
--- /var/tmp/diff_new_pack.C9OtXB/_old 2016-05-19 23:28:34.000000000 +0200
+++ /var/tmp/diff_new_pack.C9OtXB/_new 2016-05-19 23:28:34.000000000 +0200
@@ -2286,7 +2286,7 @@
# fdupes at the end fixes duplicates
for file in taken.*; do
grep -v %dir $file | sed -e "s,.*lang[^ ]* ,,; s,%doc *,," | while read f; do
- if readlink $RPM_BUILD_ROOT$f; then
+ if test -L "$RPM_BUILD_ROOT$f"; then
s="`readlink $RPM_BUILD_ROOT$f`"
if [ -f $RPM_BUILD_ROOT`dirname $f`/$s ]; then
rm $RPM_BUILD_ROOT$f
@@ -2297,6 +2297,9 @@
done
for file in filelist.*; do
+ if [ ! -f "$file" ]; then
+ continue
+ fi
grep -v %dir $file | sed -e "s,.*lang[^ ]* ,,; s,%doc *,," | while read f;
do rm -v $RPM_BUILD_ROOT$f; done
rm $file
done
bundle-lang-gnome.spec: same change
++++++ bundle-lang-kde.spec ++++++
--- /var/tmp/diff_new_pack.C9OtXB/_old 2016-05-19 23:28:34.000000000 +0200
+++ /var/tmp/diff_new_pack.C9OtXB/_new 2016-05-19 23:28:34.000000000 +0200
@@ -74,7 +74,6 @@
BuildRequires: libKF5Pty5-lang
BuildRequires: libKF5Solid5-lang
BuildRequires: libKF5SonnetCore5-lang
-BuildRequires: libKF5Style5-lang
BuildRequires: libKF5Su5-lang
BuildRequires: libKF5TextWidgets5-lang
BuildRequires: libKF5UnitConversion5-lang
@@ -195,7 +194,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -261,7 +259,6 @@
Provides: locale(libKF5Pty5:en)
Provides: locale(libKF5Solid5:en)
Provides: locale(libKF5SonnetCore5:en)
-Provides: locale(libKF5Style5:en)
Provides: locale(libKF5Su5:en)
Provides: locale(libKF5TextWidgets5:en)
Provides: locale(libKF5UnitConversion5:en)
@@ -370,7 +367,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -436,7 +432,6 @@
Provides: locale(libKF5Pty5:de)
Provides: locale(libKF5Solid5:de)
Provides: locale(libKF5SonnetCore5:de)
-Provides: locale(libKF5Style5:de)
Provides: locale(libKF5Su5:de)
Provides: locale(libKF5TextWidgets5:de)
Provides: locale(libKF5UnitConversion5:de)
@@ -545,7 +540,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -611,7 +605,6 @@
Provides: locale(libKF5Pty5:es)
Provides: locale(libKF5Solid5:es)
Provides: locale(libKF5SonnetCore5:es)
-Provides: locale(libKF5Style5:es)
Provides: locale(libKF5Su5:es)
Provides: locale(libKF5TextWidgets5:es)
Provides: locale(libKF5UnitConversion5:es)
@@ -720,7 +713,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -786,7 +778,6 @@
Provides: locale(libKF5Pty5:it)
Provides: locale(libKF5Solid5:it)
Provides: locale(libKF5SonnetCore5:it)
-Provides: locale(libKF5Style5:it)
Provides: locale(libKF5Su5:it)
Provides: locale(libKF5TextWidgets5:it)
Provides: locale(libKF5UnitConversion5:it)
@@ -895,7 +886,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -961,7 +951,6 @@
Provides: locale(libKF5Pty5:fr)
Provides: locale(libKF5Solid5:fr)
Provides: locale(libKF5SonnetCore5:fr)
-Provides: locale(libKF5Style5:fr)
Provides: locale(libKF5Su5:fr)
Provides: locale(libKF5TextWidgets5:fr)
Provides: locale(libKF5UnitConversion5:fr)
@@ -1070,7 +1059,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -1136,7 +1124,6 @@
Provides: locale(libKF5Pty5:ja)
Provides: locale(libKF5Solid5:ja)
Provides: locale(libKF5SonnetCore5:ja)
-Provides: locale(libKF5Style5:ja)
Provides: locale(libKF5Su5:ja)
Provides: locale(libKF5TextWidgets5:ja)
Provides: locale(libKF5UnitConversion5:ja)
@@ -1245,7 +1232,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -1311,7 +1297,6 @@
Provides: locale(libKF5Pty5:zh)
Provides: locale(libKF5Solid5:zh)
Provides: locale(libKF5SonnetCore5:zh)
-Provides: locale(libKF5Style5:zh)
Provides: locale(libKF5Su5:zh)
Provides: locale(libKF5TextWidgets5:zh)
Provides: locale(libKF5UnitConversion5:zh)
@@ -1420,7 +1405,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -1486,7 +1470,6 @@
Provides: locale(libKF5Pty5:nl)
Provides: locale(libKF5Solid5:nl)
Provides: locale(libKF5SonnetCore5:nl)
-Provides: locale(libKF5Style5:nl)
Provides: locale(libKF5Su5:nl)
Provides: locale(libKF5TextWidgets5:nl)
Provides: locale(libKF5UnitConversion5:nl)
@@ -1595,7 +1578,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -1661,7 +1643,6 @@
Provides: locale(libKF5Pty5:cs)
Provides: locale(libKF5Solid5:cs)
Provides: locale(libKF5SonnetCore5:cs)
-Provides: locale(libKF5Style5:cs)
Provides: locale(libKF5Su5:cs)
Provides: locale(libKF5TextWidgets5:cs)
Provides: locale(libKF5UnitConversion5:cs)
@@ -1770,7 +1751,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -1891,8 +1871,6 @@
Provides: locale(libKF5Solid5:pt_BR)
Provides: locale(libKF5SonnetCore5:pt)
Provides: locale(libKF5SonnetCore5:pt_BR)
-Provides: locale(libKF5Style5:pt)
-Provides: locale(libKF5Style5:pt_BR)
Provides: locale(libKF5Su5:pt)
Provides: locale(libKF5Su5:pt_BR)
Provides: locale(libKF5TextWidgets5:pt)
@@ -2022,7 +2000,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -2088,7 +2065,6 @@
Provides: locale(libKF5Pty5:pl)
Provides: locale(libKF5Solid5:pl)
Provides: locale(libKF5SonnetCore5:pl)
-Provides: locale(libKF5Style5:pl)
Provides: locale(libKF5Su5:pl)
Provides: locale(libKF5TextWidgets5:pl)
Provides: locale(libKF5UnitConversion5:pl)
@@ -2197,7 +2173,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -2263,7 +2238,6 @@
Provides: locale(libKF5Pty5:ca)
Provides: locale(libKF5Solid5:ca)
Provides: locale(libKF5SonnetCore5:ca)
-Provides: locale(libKF5Style5:ca)
Provides: locale(libKF5Su5:ca)
Provides: locale(libKF5TextWidgets5:ca)
Provides: locale(libKF5UnitConversion5:ca)
@@ -2372,7 +2346,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -2438,7 +2411,6 @@
Provides: locale(libKF5Pty5:ar)
Provides: locale(libKF5Solid5:ar)
Provides: locale(libKF5SonnetCore5:ar)
-Provides: locale(libKF5Style5:ar)
Provides: locale(libKF5Su5:ar)
Provides: locale(libKF5TextWidgets5:ar)
Provides: locale(libKF5UnitConversion5:ar)
@@ -2547,7 +2519,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -2613,7 +2584,6 @@
Provides: locale(libKF5Pty5:hu)
Provides: locale(libKF5Solid5:hu)
Provides: locale(libKF5SonnetCore5:hu)
-Provides: locale(libKF5Style5:hu)
Provides: locale(libKF5Su5:hu)
Provides: locale(libKF5TextWidgets5:hu)
Provides: locale(libKF5UnitConversion5:hu)
@@ -2722,7 +2692,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -2788,7 +2757,6 @@
Provides: locale(libKF5Pty5:ko)
Provides: locale(libKF5Solid5:ko)
Provides: locale(libKF5SonnetCore5:ko)
-Provides: locale(libKF5Style5:ko)
Provides: locale(libKF5Su5:ko)
Provides: locale(libKF5TextWidgets5:ko)
Provides: locale(libKF5UnitConversion5:ko)
@@ -2897,7 +2865,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -2963,7 +2930,6 @@
Provides: locale(libKF5Pty5:da)
Provides: locale(libKF5Solid5:da)
Provides: locale(libKF5SonnetCore5:da)
-Provides: locale(libKF5Style5:da)
Provides: locale(libKF5Su5:da)
Provides: locale(libKF5TextWidgets5:da)
Provides: locale(libKF5UnitConversion5:da)
@@ -3072,7 +3038,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -3138,7 +3103,6 @@
Provides: locale(libKF5Pty5:sv)
Provides: locale(libKF5Solid5:sv)
Provides: locale(libKF5SonnetCore5:sv)
-Provides: locale(libKF5Style5:sv)
Provides: locale(libKF5Su5:sv)
Provides: locale(libKF5TextWidgets5:sv)
Provides: locale(libKF5UnitConversion5:sv)
@@ -3247,7 +3211,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -3313,7 +3276,6 @@
Provides: locale(libKF5Pty5:ru)
Provides: locale(libKF5Solid5:ru)
Provides: locale(libKF5SonnetCore5:ru)
-Provides: locale(libKF5Style5:ru)
Provides: locale(libKF5Su5:ru)
Provides: locale(libKF5TextWidgets5:ru)
Provides: locale(libKF5UnitConversion5:ru)
@@ -3422,7 +3384,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -3488,7 +3449,6 @@
Provides: locale(libKF5Pty5:fi)
Provides: locale(libKF5Solid5:fi)
Provides: locale(libKF5SonnetCore5:fi)
-Provides: locale(libKF5Style5:fi)
Provides: locale(libKF5Su5:fi)
Provides: locale(libKF5TextWidgets5:fi)
Provides: locale(libKF5UnitConversion5:fi)
@@ -3597,7 +3557,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -3663,7 +3622,6 @@
Provides: locale(libKF5Pty5:nb)
Provides: locale(libKF5Solid5:nb)
Provides: locale(libKF5SonnetCore5:nb)
-Provides: locale(libKF5Style5:nb)
Provides: locale(libKF5Su5:nb)
Provides: locale(libKF5TextWidgets5:nb)
Provides: locale(libKF5UnitConversion5:nb)
@@ -3772,7 +3730,6 @@
Provides: libKF5Pty5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Pty5-lang)
Provides: libKF5Solid5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Solid5-lang)
Provides: libKF5SonnetCore5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5SonnetCore5-lang)
-Provides: libKF5Style5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Style5-lang)
Provides: libKF5Su5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5Su5-lang)
Provides: libKF5TextWidgets5-lang = %(rpm -q --queryformat '%{VERSION}'
libKF5TextWidgets5-lang)
Provides: libKF5UnitConversion5-lang = %(rpm -q --queryformat
'%{VERSION}' libKF5UnitConversion5-lang)
@@ -3838,7 +3795,6 @@
Provides: locale(libKF5Pty5:el)
Provides: locale(libKF5Solid5:el)
Provides: locale(libKF5SonnetCore5:el)
-Provides: locale(libKF5Style5:el)
Provides: locale(libKF5Su5:el)
Provides: locale(libKF5TextWidgets5:el)
Provides: locale(libKF5UnitConversion5:el)
@@ -3919,7 +3875,6 @@
packages="$packages libKF5UnitConversion5-lang"
packages="$packages libKF5TextWidgets5-lang"
packages="$packages libKF5Su5-lang"
-packages="$packages libKF5Style5-lang"
packages="$packages libKF5SonnetCore5-lang"
packages="$packages libKF5Solid5-lang"
packages="$packages libKF5Pty5-lang"
@@ -4035,7 +3990,7 @@
# fdupes at the end fixes duplicates
for file in taken.*; do
grep -v %dir $file | sed -e "s,.*lang[^ ]* ,,; s,%doc *,," | while read f; do
- if readlink $RPM_BUILD_ROOT$f; then
+ if test -L "$RPM_BUILD_ROOT$f"; then
s="`readlink $RPM_BUILD_ROOT$f`"
if [ -f $RPM_BUILD_ROOT`dirname $f`/$s ]; then
rm $RPM_BUILD_ROOT$f
@@ -4046,6 +4001,9 @@
done
for file in filelist.*; do
+ if [ ! -f "$file" ]; then
+ continue
+ fi
grep -v %dir $file | sed -e "s,.*lang[^ ]* ,,; s,%doc *,," | while read f;
do rm -v $RPM_BUILD_ROOT$f; done
rm $file
done
++++++ bundle-lang.spec.in ++++++
--- /var/tmp/diff_new_pack.C9OtXB/_old 2016-05-19 23:28:35.000000000 +0200
+++ /var/tmp/diff_new_pack.C9OtXB/_new 2016-05-19 23:28:35.000000000 +0200
@@ -116,7 +116,7 @@
# fdupes at the end fixes duplicates
for file in taken.*; do
grep -v %dir $file | sed -e "s,.*lang[^ ]* ,,; s,%doc *,," | while read f; do
- if readlink $RPM_BUILD_ROOT$f; then
+ if test -L "$RPM_BUILD_ROOT$f"; then
s="`readlink $RPM_BUILD_ROOT$f`"
if [ -f $RPM_BUILD_ROOT`dirname $f`/$s ]; then
rm $RPM_BUILD_ROOT$f
@@ -127,6 +127,9 @@
done
for file in filelist.*; do
+ if [ ! -f "$file" ]; then
+ continue
+ fi
grep -v %dir $file | sed -e "s,.*lang[^ ]* ,,; s,%doc *,," | while read f;
do rm -v $RPM_BUILD_ROOT$f; done
rm $file
done
++++++ bundle.sh ++++++
--- /var/tmp/diff_new_pack.C9OtXB/_old 2016-05-19 23:28:35.000000000 +0200
+++ /var/tmp/diff_new_pack.C9OtXB/_new 2016-05-19 23:28:35.000000000 +0200
@@ -20,7 +20,25 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-. list_langs.sh
+. ./list_langs.sh
+
+function _dirname {
+ DIR="${1%/*}"
+ if [ -z "${DIR}" ]; then
+ echo "/"
+ else
+ echo "${DIR}"
+ fi
+}
+
+function lang_to_skip {
+ if [[ " $langs " =~ (^|[[:space:]])"$1"($|[[:space:]]) ]]; then
+ # language was found in the list - do not skip it
+ return 1;
+ else
+ return 0;
+ fi
+}
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/translations
for lang in $langs; do
@@ -30,11 +48,11 @@
for package in "$@"; do
IFS=^
- rpm -q --qf
"[%{RPMTAG_FILEFLAGS:fflags}^%{FILEMODES:perms}^%{FILELANGS}^%{FILENAMES}\n]"
$package | sed '/share\/man/d' | \
+ rpm -q --qf
"[%{RPMTAG_FILEFLAGS:fflags}^%{FILEMODES:perms}^%{FILELANGS}^%{FILENAMES}\n]"
$package | sed -e '/share\/man/d' -e '/share\/appdata/d' | \
while read flag perm lang file; do
if test -z "$file"; then
- echo "WARNING: package %{package} does not exist - skipping"
+ echo "WARNING: package ${package} does not exist - skipping"
break
fi
@@ -42,6 +60,10 @@
lang="en"
fi
+ if lang_to_skip "$lang"; then
+ continue
+ fi
+
echo -n "%lang($lang) " >> filelist.$lang
if test "$flag" = "d"; then
echo -n "%doc " >> filelist.$lang
@@ -66,11 +88,11 @@
;;
esac
if test -d "$file"; then
- mkdir -p $RPM_BUILD_ROOT$nfile
+ if [ ! -d $RPM_BUILD_ROOT$nfile ]; then mkdir -p $RPM_BUILD_ROOT$nfile;
fi
echo -n "%dir " >> filelist.$lang
else
- dir=`dirname "$nfile"`
- mkdir -p $RPM_BUILD_ROOT$dir
+ dir=$(_dirname "$nfile")
+ if [ ! -d $RPM_BUILD_ROOT$dir ]; then mkdir -p $RPM_BUILD_ROOT$dir; fi
while true; do
case "$dir" in
/usr/share)
@@ -89,7 +111,7 @@
break;
;;
esac
- dir=`dirname "$dir"`
+ dir=$(_dirname "$dir")
done
cp -d --preserve=all -P "$file" $RPM_BUILD_ROOT$nfile
fi
++++++ list_langs.sh ++++++
--- /var/tmp/diff_new_pack.C9OtXB/_old 2016-05-19 23:28:35.000000000 +0200
+++ /var/tmp/diff_new_pack.C9OtXB/_new 2016-05-19 23:28:35.000000000 +0200
@@ -1,3 +1 @@
-langs="af ar az be bg bn br bs ca cs da de el en_GB eo es et eu fa fi fr fy ga
gl gu he hi hr hu is it"
-langs="$langs ja ko km lo lt lv mk mn ms mt nb nds nl nn nso pa pl pt pt_BR ro
ru rw se sk sl sr sr@Latn sv"
-langs="$langs ta tg th tr tt uk uz vi ven wa xh zh_CN zh_TW zu cy en_US id ka
mr en zh"
+langs="en de es it fr ja zh nl cs pt pl ca ar hu ko da sv ru fi nb el zh_CN
zh_TW pt_BR"
++++++ packages.txt ++++++
--- /var/tmp/diff_new_pack.C9OtXB/_old 2016-05-19 23:28:35.000000000 +0200
+++ /var/tmp/diff_new_pack.C9OtXB/_new 2016-05-19 23:28:35.000000000 +0200
@@ -26,7 +26,6 @@
avahi-lang common
baloo5-lang kde
balsa-lang gnome-extras
-banshee-core-lang gnome-extras
baobab-lang gnome
bash-lang common
bijiben-lang gnome
@@ -303,7 +302,6 @@
libKF5Pty5-lang kde
libKF5Solid5-lang kde
libKF5SonnetCore5-lang kde
-libKF5Style5-lang kde
libKF5Su5-lang kde
libKF5TextWidgets5-lang kde
libKF5UnitConversion5-lang kde
@@ -451,7 +449,6 @@
vte2-lang gnome-extras
weather-wallpaper-lang gnome-extras
x-tile-lang gnome-extras
-xchat-gnome-lang gnome-extras
xdg-user-dirs-gtk-lang gnome
xdg-user-dirs-lang common
xkeyboard-config-lang common
++++++ update-list.sh ++++++
--- /var/tmp/diff_new_pack.C9OtXB/_old 2016-05-19 23:28:35.000000000 +0200
+++ /var/tmp/diff_new_pack.C9OtXB/_new 2016-05-19 23:28:35.000000000 +0200
@@ -76,8 +76,12 @@
languages="$languages fi nb"
# agustin invented
languages="$languages el"
+# Chinese and Portuguese are a little bit special - and are merged in a
special way
+special_languages="zh_CN zh_TW pt_BR"
bundles="kde gnome common"
+echo langs=\"$languages $special_languages\" > list_langs.sh
+
LC_ALL=C sort -o packages.txt packages.txt
uniq=`cut -d' ' -f1 packages.txt | uniq -d`
if test -n "$uniq"; then
