- Version update to 5.2.3.2:

* Various small fixes in the 5.2 branch
- Move the firebird db connector to subpackage wrt bsc#1003896

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=435
This commit is contained in:
Tomáš Chvátal 2016-10-31 11:50:26 +00:00 committed by Git OBS Bridge
parent c346b19dd9
commit bb1842fdff
8 changed files with 36 additions and 16 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Oct 31 11:43:29 UTC 2016 - tchvatal@suse.com
- Version update to 5.2.3.2:
* Various small fixes in the 5.2 branch
- Move the firebird db connector to subpackage wrt bsc#1003896
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 28 12:39:04 UTC 2016 - tchvatal@suse.com Wed Sep 28 12:39:04 UTC 2016 - tchvatal@suse.com

View File

@ -22,7 +22,7 @@
%define numbertext_version 0.9.5 %define numbertext_version 0.9.5
# Urls # Urls
%define external_url http://dev-www.libreoffice.org/src/ %define external_url http://dev-www.libreoffice.org/src/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.2.2 %define tarball_url http://download.documentfoundation.org/libreoffice/src/5.2.3
# Wether to enable the kde integration # Wether to enable the kde integration
%if 0%{?is_opensuse} || %{suse_version} == 1320 %if 0%{?is_opensuse} || %{suse_version} == 1320
%bcond_without kdeintegration %bcond_without kdeintegration
@ -30,7 +30,7 @@
%bcond_with kdeintegration %bcond_with kdeintegration
%endif %endif
Name: libreoffice Name: libreoffice
Version: 5.2.2.2 Version: 5.2.3.2
Release: 0 Release: 0
Summary: A Free Office Suite (Framework) 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 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
@ -468,8 +468,16 @@ Group: Productivity/Office/Suite
Requires: postgresql Requires: postgresql
%description base-drivers-postgresql %description base-drivers-postgresql
This package allows to access PostgreSQL databases from LibreOffice This package allows to access PostgreSQL databases from LibreOffice Base.
Base.
%package base-drivers-firebird
Summary: Firebird Database Driver for LibreOffice
License: LGPL-2.1+
Group: Productivity/Office/Suite
Requires: firebird
%description base-drivers-firebird
This package allows to access Firebird databeses from LibreOffice Base.
%package filters-optional %package filters-optional
Summary: Additional Import and Export Filters for LibreOffice Summary: Additional Import and Export Filters for LibreOffice
@ -485,7 +493,6 @@ Supplements: %{name}
%description filters-optional %description filters-optional
This package includes some additional import and export filters for This package includes some additional import and export filters for
LibreOffice: LibreOffice:
- AportisDoc (Palm) - AportisDoc (Palm)
- Pocket Excel - Pocket Excel
- Pocket Word - Pocket Word
@ -625,8 +632,7 @@ Requires(pre): libreoffice = %{version}
Supplements: packageand(libreoffice-base:mysql-client) Supplements: packageand(libreoffice-base:mysql-client)
%description base-drivers-mysql %description base-drivers-mysql
This package allows to access MySQL databases from LibreOffice This package allows to access MySQL databases from LibreOffice Base.
Base.
%package calc-extensions %package calc-extensions
Summary: LibreOffice Calc Extensions Summary: LibreOffice Calc Extensions
@ -1060,6 +1066,9 @@ set +x
grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist
mv tmplist file-lists/gnome_list.txt mv tmplist file-lists/gnome_list.txt
# Remove firebird connector from main package filelist
sed -i -e '/%{_libdir}\/libreoffice\/program\/libfirebird_sdbclo.so/d' file-lists/*
################ ################
# update desktop files # update desktop files
builddir=`pwd` builddir=`pwd`
@ -1368,6 +1377,10 @@ exit 0
%files -f file-lists/postgresql_list.txt base-drivers-postgresql %files -f file-lists/postgresql_list.txt base-drivers-postgresql
%defattr(-,root,root) %defattr(-,root,root)
%files base-drivers-firebird
%defattr(-,root,root)
%{_libdir}/libreoffice/program/libfirebird_sdbclo.so
%files -f file-lists/filters_list.txt filters-optional %files -f file-lists/filters_list.txt filters-optional
%defattr(-,root,root) %defattr(-,root,root)