diff --git a/0001-allow-none-gi-support.patch b/0001-allow-none-gi-support.patch new file mode 100644 index 0000000..b23513d --- /dev/null +++ b/0001-allow-none-gi-support.patch @@ -0,0 +1,59 @@ +From 84bfe584e4bd03a7b6e2c1e68c65bf99ae83c839 Mon Sep 17 00:00:00 2001 +From: Pranav Kant +Date: Tue, 18 Oct 2016 17:27:00 +0530 +Subject: tdf#102511: Add (allow-none) for backward GI compatibility + +(allow-none), though deprecated since GI 1.42, is required to +maintain the backward compatibility since (nullable), added in +GI 1.42, is not understood by GI tools < 1.42 preventing the +clients from passing a null parameter to various functions in the +widget. + +We can remove this deprecated (allow-none) annotation once we +bump the GI version in LibreOffice to atleast 1.42 + +Change-Id: I98a1f3d2205ec5afd8060f16e69c5f938f229e26 + +Index: libreoffice-5.2.3.2/include/LibreOfficeKit/LibreOfficeKitGtk.h +=================================================================== +--- libreoffice-5.2.3.2.orig/include/LibreOfficeKit/LibreOfficeKitGtk.h ++++ libreoffice-5.2.3.2/include/LibreOfficeKit/LibreOfficeKitGtk.h +@@ -42,7 +42,7 @@ GType lok_doc_v + + /** + * lok_doc_view_new: +- * @pPath: (nullable): LibreOffice install path. Pass null to set it to default ++ * @pPath: (nullable): (allow-none): LibreOffice install path. Pass null to set it to default + * path which in most cases would be $libdir/libreoffice/program + * @cancellable: The cancellable object that you can use to cancel this + * operation. +@@ -56,9 +56,9 @@ GtkWidget* lok_doc_v + + /** + * lok_doc_view_new_from_user_profile: +- * @pPath: (nullable): LibreOffice install path. Pass null to set it to default ++ * @pPath: (nullable): (allow-none): LibreOffice install path. Pass null to set it to default + * path which in most cases would be $libdir/libreoffice/program +- * @pUserProfile: (nullable): User profile URL. Must be either a file URL or a ++ * @pUserProfile: (nullable): (allow-none): User profile URL. Must be either a file URL or a + * special vnd.sun.star.pathname URL. Pass non-null to be able to use this + * widget and LibreOffice itself in parallel. + * @cancellable: The cancellable object that you can use to cancel this +@@ -84,7 +84,7 @@ GtkWidget* lok_doc_v + * lok_doc_view_open_document: + * @pDocView: The #LOKDocView instance + * @pPath: (transfer full): The path of the document that #LOKDocView widget should try to open +- * @pRenderingArguments: (nullable): lok::Document::initializeForRendering() arguments. ++ * @pRenderingArguments: (nullable): (allow-none): lok::Document::initializeForRendering() arguments. + * @cancellable: + * @callback: + * @userdata: +@@ -307,7 +307,7 @@ gboolean lok_doc_ + * lok_doc_view_set_document_password: + * @pDocView: The #LOKDocView instance + * @pUrl: the URL of the document to set password for, as sent with signal `password-required` +- * @pPassword: (nullable): the password, NULL for no password ++ * @pPassword: (nullable): (allow-none): the password, NULL for no password + * + * Set the password for password protected documents + */ diff --git a/libreoffice-5.2.2.2.tar.xz b/libreoffice-5.2.2.2.tar.xz deleted file mode 100644 index 9ede000..0000000 --- a/libreoffice-5.2.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5952eaa0b06a0659cf7cca397f95c00e73f0f410f14310deb363985746dad9e0 -size 182258452 diff --git a/libreoffice-5.2.3.3.tar.xz b/libreoffice-5.2.3.3.tar.xz new file mode 100644 index 0000000..69a5e12 --- /dev/null +++ b/libreoffice-5.2.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 +size 183870036 diff --git a/libreoffice-help-5.2.2.2.tar.xz b/libreoffice-help-5.2.2.2.tar.xz deleted file mode 100644 index bd864e5..0000000 --- a/libreoffice-help-5.2.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01c639223d9a31b58480935e1fef4f1bc7b82306f5fac8b6269541ab411ca2be -size 1919792 diff --git a/libreoffice-help-5.2.3.3.tar.xz b/libreoffice-help-5.2.3.3.tar.xz new file mode 100644 index 0000000..5f97c20 --- /dev/null +++ b/libreoffice-help-5.2.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a +size 1936920 diff --git a/libreoffice-translations-5.2.2.2.tar.xz b/libreoffice-translations-5.2.2.2.tar.xz deleted file mode 100644 index be72a84..0000000 --- a/libreoffice-translations-5.2.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1ae61411106679769bdafa8c62f48b124874784e19bb53501ebbf61d670bc5b -size 131376740 diff --git a/libreoffice-translations-5.2.3.3.tar.xz b/libreoffice-translations-5.2.3.3.tar.xz new file mode 100644 index 0000000..ceadafb --- /dev/null +++ b/libreoffice-translations-5.2.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8401e51c4b91cd47f103ba09519f0b5b9213561b7d6296ff5bdc2d1622950a48 +size 141771228 diff --git a/libreoffice.changes b/libreoffice.changes index 6d18f5a..3070b42 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,9 +1,36 @@ +------------------------------------------------------------------- +Sun Nov 6 09:10:11 UTC 2016 - tchvatal@suse.com + +- Add provides/obsoletes for brazilian and chinese to be matched on + dvd bnc#1008743 + +------------------------------------------------------------------- +Sat Nov 5 19:59:30 UTC 2016 - tchvatal@suse.com + +- Update to 5.2.3.3: + * small fix from .2 release + +------------------------------------------------------------------- +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 +- Refresh a bit patch 0001-allow-none-gi-support.patch + ------------------------------------------------------------------- Wed Sep 28 12:39:04 UTC 2016 - tchvatal@suse.com - Version update to 5.2.2.2: * Various fixes for the 5.2 branch +------------------------------------------------------------------- +Sun Sep 25 20:13:08 UTC 2016 - mgorse@suse.com + +- Add 0001-allow-none-gi-support.patch: don't use + "nullable" for introspection, since it isn't available on SLE12 + version of gobject-introspection (bsc#1000102). + ------------------------------------------------------------------- Mon Sep 12 09:46:37 UTC 2016 - zaitor@opensuse.org diff --git a/libreoffice.spec b/libreoffice.spec index 6fa2b85..73db209 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -22,7 +22,7 @@ %define numbertext_version 0.9.5 # Urls %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 %if 0%{?is_opensuse} || %{suse_version} == 1320 %bcond_without kdeintegration @@ -30,7 +30,7 @@ %bcond_with kdeintegration %endif Name: libreoffice -Version: 5.2.2.2 +Version: 5.2.3.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 @@ -74,6 +74,8 @@ Patch16: libreoffice-hotfix-disablebrokenshapetest.patch # PATCH-FIX-UPSTREAM: fix build against (system) Firebird 3.0 Patch17: libreoffice-firebird3.patch Patch18: libreoffice-firebird3-selftest.patch +# PATCH-FIX-UPSTREAM: taken from 5.3 branch to fix working with sle12 gnome introspection +Patch19: 0001-allow-none-gi-support.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -466,8 +468,16 @@ Group: Productivity/Office/Suite Requires: postgresql %description base-drivers-postgresql -This package allows to access PostgreSQL databases from LibreOffice -Base. +This package allows to access PostgreSQL databases from LibreOffice 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 Summary: Additional Import and Export Filters for LibreOffice @@ -483,7 +493,6 @@ Supplements: %{name} %description filters-optional This package includes some additional import and export filters for LibreOffice: - - AportisDoc (Palm) - Pocket Excel - Pocket Word @@ -613,18 +622,17 @@ appearance and behavior. %package base-drivers-mysql Summary: MySQL Database Driver for LibreOffice -License: GPL-2.0 and LGPL-3.0 -Group: Productivity/Office/Suite # This mysql thing is just dlopened # WARNING: the soname might change! +License: GPL-2.0 and LGPL-3.0 +Group: Productivity/Office/Suite Requires: libmysqlclient_r18 Requires: libreoffice-base = %{version} Requires(pre): libreoffice = %{version} Supplements: packageand(libreoffice-base:mysql-client) %description base-drivers-mysql -This package allows to access MySQL databases from LibreOffice -Base. +This package allows to access MySQL databases from LibreOffice Base. %package calc-extensions Summary: LibreOffice Calc Extensions @@ -885,8 +893,8 @@ Provides additional %{langname} translations and resources for %{project}. \ %langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN %langpack -l pl -n Polish -X -m pl_PL %define langpack_lang Brazilian Portuguese -%langpack -l pt-BR -n %{langpack_lang} -m pt_BR -p pt_BR -X -%langpack -l pt-PT -n Portuguese -m pt_PT -L pt -x pt -p pt +%langpack -l pt_BR -n %{langpack_lang} -m pt_BR -L pt-BR -p pt-BR -X +%langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT %langpack -l ro -n Romanian -M -X %langpack -l ru -n Russian -X -m ru_RU %langpack -l si -n Sinhalese -S ctl -m si_LK @@ -907,9 +915,9 @@ Provides additional %{langname} translations and resources for %{project}. \ %langpack -l ve -n Venda %langpack -l xh -n Xhosa %define langpack_lang Simplified Chinese -%langpack -l zh-Hans -n %{langpack_lang} -p zh-CN -s cjk -L zh-CN -x zh-CN +%langpack -l zh_CN -n %{langpack_lang} -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans %define langpack_lang Traditional Chinese -%langpack -l zh-Hant -n %{langpack_lang} -p zh-TW -s cjk -L zh-TW -x zh-TW +%langpack -l zh_TW -n %{langpack_lang} -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant %langpack -l zu -n Zulu -m zu_ZA %undefine langpack_lang @@ -922,6 +930,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 cp -vn %{SOURCE20} dbaccess/qa/unit/data/ %patch990 -p1 @@ -1057,6 +1066,10 @@ set +x grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist mv tmplist file-lists/gnome_list.txt +# Remove firebird connector from main package filelist +grep -v "%{_libdir}/libreoffice/program/libfirebird_sdbclo.so" file-lists/common_list.txt > tmplist +mv tmplist file-lists/common_list.txt + ################ # update desktop files builddir=`pwd` @@ -1365,6 +1378,10 @@ exit 0 %files -f file-lists/postgresql_list.txt base-drivers-postgresql %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 %defattr(-,root,root)