Accepting request 358225 from LibreOffice:Factory

- Un-split the gtk3 from separate module 5.1 should be stable enough

- Do not install the appdata xml files twice bnc#965294

- Version update to 5.1.0.3:
  * Various small fixes on road to final tag
  * Update internal tarballs for sle11 build

- Fix requires on libmysqlclient_r18 on SLE11
- Fix a bug on es provides with en-GB
- Provide l10n-pt from pt-PT

OBS-URL: https://build.opensuse.org/request/show/358225
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=104

libcdr-0.1.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72fe7bbbf2275242acdf67ad2f9b6c71ac9146a56c409def360dabcac5695b49
-size 664694

libcdr-0.1.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d05a986dab9f960e64466072653a900d03f8257b084440d9d16599e16060581e
+size 696296

libetonyek-0.1.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b0b28dd5965c15776be879553d442eb8922d35c20cd3239140b352c0ad80b0b
-size 1580354

libetonyek-0.1.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78
+size 1696455

libodfgen-0.1.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9caa824bf60fea84fb7cad26ebbffe585b1349fe4d0ddbafcd8b3aee47c26ebd
-size 437050

libodfgen-0.1.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
+size 446705

libreoffice-5.1.0.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f9ad7194eeea9bc6079816c622d36250348bb9c9e304b96adbecb1503d68fb0
-size 175725812

libreoffice-5.1.0.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b41b03f008dab3439bde31c1918f0477c035eab629166a79eeebb0bb6e8757b3
+size 175720564

libreoffice-help-5.1.0.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8acecf7ba99890cbf6aa470beedeaf248daaa1e12e4be770b4b3c20a47987e89
-size 1904348

libreoffice-help-5.1.0.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2e9dff6a930637ca9b203dc31b7f87b17a03419891201a386e81bfbbdc1b447
+size 1903996

libreoffice-translations-5.1.0.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83d8f4339edb21781fecd3aba28a470c06ece3da9466fa24e21d374fb7db523f
-size 131463556

libreoffice-translations-5.1.0.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd0eeee993b8532288b77a43bfda9db6cdf781df3cb43f753ed01b620e760ee3
+size 131527452

libreoffice.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Sat Feb  6 12:54:39 UTC 2016 - tchvatal@suse.com
+
+- Un-split the gtk3 from separate module 5.1 should be stable enough
+
+-------------------------------------------------------------------
+Sat Feb  6 12:45:55 UTC 2016 - tchvatal@suse.com
+
+- Do not install the appdata xml files twice bnc#965294
+
+-------------------------------------------------------------------
+Fri Jan 29 13:00:44 UTC 2016 - tchvatal@suse.com
+
+- Version update to 5.1.0.3:
+  * Various small fixes on road to final tag
+  * Update internal tarballs for sle11 build
+
+-------------------------------------------------------------------
+Thu Jan 21 14:02:08 UTC 2016 - tchvatal@suse.com
+
+- Fix requires on libmysqlclient_r18 on SLE11
+- Fix a bug on es provides with en-GB
+- Provide l10n-pt from pt-PT
+
 -------------------------------------------------------------------
 Sun Jan 17 08:04:26 UTC 2016 - tchvatal@suse.com
 

libreoffice.spec

@@ -64,7 +64,7 @@ Requires:       python-importlib
 %endif
 # This is used due to the need for beta releases
 Name:           libreoffice
-Version:        5.1.0.2
+Version:        5.1.0.3
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
@@ -99,20 +99,20 @@ Source2004:     %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 Source2005:     %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 # Bundled sources for without-system-libs build
 Source2006:     %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
-Source2007:     %{external_url}/librevenge-0.0.2.tar.bz2
+Source2007:     %{external_url}/librevenge-0.0.4.tar.bz2
 Source2008:     %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-Source2009:     %{external_url}/libetonyek-0.1.5.tar.bz2
+Source2009:     %{external_url}/libetonyek-0.1.6.tar.bz2
 Source2010:     %{external_url}/libe-book-0.1.2.tar.bz2
 Source2011:     %{external_url}/libfreehand-0.1.1.tar.bz2
-Source2012:     %{external_url}/libodfgen-0.1.5.tar.bz2
+Source2012:     %{external_url}/libodfgen-0.1.6.tar.bz2
-Source2013:     %{external_url}/libcdr-0.1.1.tar.bz2
+Source2013:     %{external_url}/libcdr-0.1.2.tar.bz2
 Source2014:     %{external_url}/libmspub-0.1.2.tar.bz2
 Source2015:     %{external_url}/libmwaw-0.3.7.tar.bz2
 Source2016:     %{external_url}/libpagemaker-0.0.2.tar.bz2
-Source2017:     %{external_url}/libvisio-0.1.3.tar.bz2
+Source2017:     %{external_url}/libvisio-0.1.5.tar.bz2
 Source2018:     %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
-Source2019:     %{external_url}/libwpd-0.10.0.tar.bz2
+Source2019:     %{external_url}/libwpd-0.10.1.tar.bz2
-Source2020:     %{external_url}/libwpg-0.3.0.tar.bz2
+Source2020:     %{external_url}/libwpg-0.3.1.tar.bz2
 Source2021:     %{external_url}/libwps-0.4.2.tar.bz2
 Source2022:     %{external_url}/libabw-0.1.1.tar.bz2
 Source2023:     %{external_url}/lcms2-2.6.tar.gz
@@ -632,15 +632,6 @@ Requires:       %{name} = %{version}
 %description gnome
 This package contains some GNOME extensions for LibreOffice.
 
-%package gtk3
-Summary:        Gtk3 interface for LibreOffice
-License:        LGPL-3.0
-Group:          Productivity/Office/Suite
-Requires:       %{name}-gnome = %{version}
-
-%description gtk3
-This package contains Gtk3 interface rendering option for LibreOffice.
-
 %package kde4
 Summary:        KDE4 Extensions for LibreOffice
 License:        LGPL-3.0
@@ -714,7 +705,11 @@ Group:          Productivity/Office/Suite
 Requires:       libreoffice-base = %{version}
 # This mysql thing is just dlopened
 # WARNING: the soname might change!
+%if 0%{?suse_version} == 1110
+Requires:       libmysql55client_r18
+%else
 Requires:       libmysqlclient_r18
+%endif
 Requires(pre):  libreoffice = %{version}
 Supplements:    packageand(libreoffice-base:mysql-client)
 
@@ -847,6 +842,7 @@ fi \
 # Mm:  myspell dependency
 # n:   language name, e.g., Czech
 # p:   Provides: of libreoffice-l10n
+# q:   Provides: of libreoffice-l10n if one provide is not enough
 # r:   comma-separated list of additional requires
 # S:s: script classification (cjk, ctl). -S is only a marker, as it does
 #      not add any .xcd into the package (the file does not exist for at
@@ -857,7 +853,7 @@ fi \
 # Example:
 # libreoffice-l10n-cs: langpack for Czech lang. Requiring myspell-cs_CZ:
 # %%langpack -l cs -n Czech -m cs_CZ
-%define langpack(c:Ei:L:l:Mm:n:p:r:S:s:TXx:) \
+%define langpack(c:Ei:L:l:Mm:n:p:q:r:S:s:TXx:) \
 %define project LibreOffice \
 %define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \
 %define _langpack_lang %{-L:%{-L*}}%{!-L:%{lang}} \
@@ -876,7 +872,14 @@ BuildArch:      noarch \
 %endif \
 %{-m:Requires: myspell-%{-m*}}%{!-m:%{-M:Requires: myspell-%{lang}}} \
 %{-r:Requires: %{-r*}} \
-%{-p:Provides: %{name}-l10n-%{-p*}} \
+%{-p: \
+Provides: %{name}-l10n-%{-p*} = %{version} \
+Obsoletes: %{name}-l10n-%{-p*} < %{version} \
+} \
+%{-q: \
+Provides: %{name}-l10n-%{-q*} = %{version} \
+Obsoletes: %{name}-l10n-%{-q*} < %{version} \
+} \
 %{-T: \
 Provides:       %{name}-help-%{lang} = %{version} \
 Obsoletes:      %{name}-help-%{lang} < %{version} \
@@ -888,6 +891,10 @@ Obsoletes:      %{name}-help-%{-L*} < %{version} \
 Provides:       %{name}-help-%{-p*} = %{version} \
 Obsoletes:      %{name}-help-%{-p*} < %{version} \
 } \
+%{-q: \
+Provides:       %{name}-help-%{-q*} = %{version} \
+Obsoletes:      %{name}-help-%{-q*} < %{version} \
+} \
 } \
 \
 %description %{pkgname} \
@@ -925,7 +932,7 @@ Provides additional %{langname} translations and resources for %{project}. \
 %langpack -l de -n German -T -X -M
 %langpack -l dz -n Dzongkha -s ctl -T
 %langpack -l el -n Greek  -T -m el_GR
-%langpack -l en -n English -L en-US -T -X -p en-GB -p en-ZA -M
+%langpack -l en -n English -L en-US -T -X -p en-GB -q en-ZA -M
 %langpack -l es -n Spanish -M -T -X
 %langpack -l et -n Estonian -T -m et_EE
 %langpack -l eu -n Basque -T
@@ -961,7 +968,7 @@ Provides additional %{langname} translations and resources for %{project}. \
 %langpack -l pl -n Polish -T -X -m pl_PL
 %define langpack_lang Brazilian Portuguese
 %langpack -l pt-BR -n %{langpack_lang} -m pt_BR -p pt_BR -T -X
-%langpack -l pt-PT -n Portuguese -m pt_PT -T -L pt -x pt
+%langpack -l pt-PT -n Portuguese -m pt_PT -T -L pt -x pt -p pt
 %langpack -l ro -n Romanian -M -X
 %langpack -l ru -n Russian -T -X -m ru_RU
 %langpack -l si -n Sinhalese -S ctl -T -m si_LK
@@ -1193,10 +1200,6 @@ set +x
 install -m755 instdir/program/libsaxlo.so %{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so
 echo "%{_libdir}/%{name}/program/libsaxlo.so" >>file-lists/common_list.txt
 
-# Split out gtk3 interface to -gtk3 subpackage
-grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist
-mv tmplist file-lists/gnome_list.txt
-
 ################
 # update desktop files
 builddir=`pwd`
@@ -1322,6 +1325,7 @@ for appdata in base calc draw impress writer; do
   sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop/" \
     sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/${appdata}.appdata.xml
   echo "%{_datadir}/appdata/${appdata}.appdata.xml" >>file-lists/${appdata}_list.txt
+  rm -rf %{buildroot}%{_datadir}/appdata/libreoffice-${appdata}.appdata.xml
 done
 %endif
 
@@ -1535,26 +1539,21 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null |
 
 %files -f file-lists/base_list.txt base
 %defattr(-,root,root)
-%{_datadir}/appdata/libreoffice-base.appdata.xml
 
 %files -f file-lists/calc_list.txt calc
 %defattr(-,root,root)
-%{_datadir}/appdata/libreoffice-calc.appdata.xml
 
 %files -f file-lists/draw_list.txt draw
 %defattr(-,root,root)
-%{_datadir}/appdata/libreoffice-draw.appdata.xml
 
 %files -f file-lists/math_list.txt math
 %defattr(-,root,root)
 
 %files -f file-lists/impress_list.txt impress
 %defattr(-,root,root)
-%{_datadir}/appdata/libreoffice-impress.appdata.xml
 
 %files -f file-lists/writer_list.txt writer
 %defattr(-,root,root)
-%{_datadir}/appdata/libreoffice-writer.appdata.xml
 
 %files -f file-lists/postgresql_list.txt base-drivers-postgresql
 %defattr(-,root,root)
@@ -1571,12 +1570,6 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null |
 %files -f file-lists/gnome_list.txt gnome
 %defattr(-,root,root)
 
-%if %{with newmedia}
-%files gtk3
-%defattr(-,root,root)
-%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so
-%endif
-
 %files -f file-lists/kde4_list.txt kde4
 %defattr(-,root,root)
 

librevenge-0.0.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dedd6fe1f643fc2f254f2ad3719547084bd86bcc482104b995caf3b828368b18
-size 486777

librevenge-0.0.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf
+size 529833

libvisio-0.1.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ef38410a6f0c4b0c04d600ee7bbd9581f62fc6635961344d56ae27c3b6f8fae
-size 595228

libvisio-0.1.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e
+size 602628

libwpd-0.10.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f2bf5d65156a351ce404550dd822c8db8ab8740b393f61dba828d1b2cb33fe91
-size 632272

libwpd-0.10.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d
+size 656856

libwpg-0.3.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28fc3580228a82948dfc01d07abd5076c8b0df76a68702c1a81eb88fdf377348
-size 381878

libwpg-0.3.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59
+size 397128