diff --git a/0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch b/0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch deleted file mode 100644 index 027ef56..0000000 --- a/0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 40eb50bde3922f23cd071c1e8e0b2cce5ca2d747 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Wed, 11 Sep 2019 09:58:43 +0200 -Subject: [PATCH] Check for EMOJI content only on ICU 57 and newer - -The older ICU does not have the logic to work with there as it is -feature of the new icu only: - http://bugs.icu-project.org/trac/ticket/11802 - -Change-Id: Icd21be1e20b7cb988e94d107406a4f81d00116a7 ---- - vcl/unx/generic/fontmanager/fontconfig.cxx | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx -index c7bfbb47e9bd..a36dfc868329 100644 ---- a/vcl/unx/generic/fontmanager/fontconfig.cxx -+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx -@@ -798,7 +798,11 @@ namespace - - bool isEmoji(sal_uInt32 nCurrentChar) - { -+#if U_ICU_VERSION_MAJOR_NUM >= 57 - return u_hasBinaryProperty(nCurrentChar, UCHAR_EMOJI); -+#else -+ return false; -+#endif - } - - //returns true if the given code-point couldn't possibly be in rLangTag. --- -2.23.0 - diff --git a/libreoffice-6.3.2.2.tar.xz b/libreoffice-6.3.2.2.tar.xz deleted file mode 100644 index 2705be4..0000000 --- a/libreoffice-6.3.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:407da27b18f10e8beda6a9c7137273098ddfd59503e502d99e239ff7fb07bd75 -size 224752776 diff --git a/libreoffice-6.3.2.2.tar.xz.asc b/libreoffice-6.3.2.2.tar.xz.asc deleted file mode 100644 index 9ca2c3d..0000000 --- a/libreoffice-6.3.2.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2CRREACgkQ9DSh76/u -rqO+VRAArSG3wX1Zna+l4OxnLvnZAcq9vDyFJnEXQXM4VUndRtyOSJtaqSYAIcMN -fz3p1QBuu985AhxtYV3WCiOYoaTP6ARcRW0FUtdo1CSqDfw4W/235ZdBYWXpCw3N -44+aaKk/6zSUIsW30eCIYo3txHlLznW9MamBdqeunqGjSV3PxBELPMWb4NOm0qEZ -ShefgcAiSexd2/IhTQs3v1o2BXvnl7vbUJLwyRqe7s6WtfS7QtsRM6pt5tqInGKS -oY+qcljennDAsc9wjb1S1KV+iRzeK/Gg7EpvQob8LlSw9xBUJ1vfTr3qHZujYOQN -JpSMT2nWkORg3PBsaSRS2M5c7T9um8+2ZJwZXinVGudmk44lQHZsGECTi3rpje6w -woXFPdyw2j0T3t1JAYU/eUjjlEqk5veE+cb3wH+SDN9kkjg3+2aEu1TlXiAaf9B3 -O1IQeBfuxjLrz8yK6FBSLBekpn9Psjl7Tgoi2DhN/Hz/hBkENYhaN8dZhCwRt6pd -5SJyRHm+FXF50JIiOSNNw0ao7W6GEXJM16TupdGD7xyISxMQzeLOJeu8m2ZeZGS4 -I+3sGk4XXhcHDJ8bpUaIrG67FE1FQvBZqsHUKEIW50casmlfnDulKqmngV+eg33j -0bPwqjryS5a/EKPEeyiLxUHlpHWAPTTHKcWOLjZvlDwVSM+mQek= -=42nS ------END PGP SIGNATURE----- diff --git a/libreoffice-6.3.3.1.tar.xz b/libreoffice-6.3.3.1.tar.xz new file mode 100644 index 0000000..50866c1 --- /dev/null +++ b/libreoffice-6.3.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e39753489049eb2c6a698862b7d465aa98cf53b1d6c32571368d97bc144277a +size 224937884 diff --git a/libreoffice-6.3.3.1.tar.xz.asc b/libreoffice-6.3.3.1.tar.xz.asc new file mode 100644 index 0000000..f7bc48e --- /dev/null +++ b/libreoffice-6.3.3.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2g1i0ACgkQ9DSh76/u +rqPDTBAAz3XFMsLy12aa3b9O7aMESB8rDP3FwD7wjHFvWSciyDWAZVtsHyCASQgb +vdl0ueZXrCBMv9ZZOL/HkmFd/EubZ+X/zDLZ32a1C+oGvNuALGw8s4u0qNE5iaSW +As4e6sqgmjMQFrIM0DCWkf091NgS+u/GELP73Sb53gytpz9QWzX3YEOsfngSSNda +aTI3qwigzFRv6n72cxvU+xX6YwE1g+WlUgJuybn3XhvJLNnFmX+cgjtnqpaJsZUs +h3yHPdf230KtnQqRj/aKNMRFWjbKFHp2Sp5ujW3mdvhJlt1qjffXqMLRY/g4J+VI +2UgT7zGxQ5ItUSJwgNBylY4GUWM6GMF7KQuOqB57g0KB1gtmc/zAPi/loqe6ezjH +NQi6AYxIivm39pvr8YY7bbcpi8UHNT6tNH0SrDG3aulACXa3dftrosq8HTkPSM3V +hiomhadrUwhKSGBKqGBgxJBf1B4P5VbS10FQOWJHVyfd+9dGmgWD0AmDqs/rZoIe +lyJZDjg3dz7eWLJZzxaaFohHFTAnq+e9UDm7N5vEpRupDeYhN/d56g6YOOiZaW8T +R6TSgMiDBVD3g0F2vrd1HC/3a3sw3bb0u4XGp41I74XcDkifBTS0ufo40IaVIla2 +xt/Of/OBZydET/UCzIB0vFMvkNteO/LEdceZsbVAFOUlHfLisxc= +=iC3u +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-6.3.2.2.tar.xz b/libreoffice-help-6.3.2.2.tar.xz deleted file mode 100644 index 648cb8c..0000000 --- a/libreoffice-help-6.3.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:128653fca87641343011b4f83c6c7367f79b0d3f299b76ca9c00aa670a8ea7aa -size 13192064 diff --git a/libreoffice-help-6.3.2.2.tar.xz.asc b/libreoffice-help-6.3.2.2.tar.xz.asc deleted file mode 100644 index 6f12970..0000000 --- a/libreoffice-help-6.3.2.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2CRRUACgkQ9DSh76/u -rqPH0A/8CGN4k95jMkgF6pgvni2ZVE1ZQPeGz7U0LfkfQoDmHua7Y8/rj9k+Q1qI -f0IK6QmJXRkk/mqabFmnxLEfYlQXmFyg1E3SO7F6svOj9FWL7Kic3Iz4A5TpnWKF -TyHo02O7Uq8vxDic6yxB3GT9IyZS/5NmLykeM3gVd9DJX6z4L/IxCPS7kryHkuxe -RmhaQqOknLBdbJwp9d2iccoYkWbAAE2f2lLZ5dI49qYNZVihrD3dmlLqUE3RFCN7 -g3pv0eWzlYdYyx7zNBVsks/1xUQAcaGJqMmeulomUCn0s7ttZcMr/9YVTHE79E8W -LLhBmISLNanopFXKISuwrSvZQ3IGZ9dw72fxy3MBP2/VEFtE5WNF/G0sSWUN+09A -QGJDAS1X5Z2eDxBuz+T7/uQFpefrtZzLp32017pzMnieOPaXsw6P9DiBVx613sf+ -G3zdn91+nXlM3F+vPCCXA2tzrWcY7zLHZWgoBaQTBvQy3Gs+YDjmtRS6ug0E4LXH -o8WrDuPhkhR8U65dHOtmLLoFehlunZAfAfqPba5ExOZPRPieQNLamEnCuawKRsh1 -bkwLKfGh1yxoJaPuofZFqSRfwwGfovvZcIej4nnwPDKPnd2OS/he9lIKcLl1IUkB -t922qRjp/jA4NbxoP2LSu1QYK91N5hXpeJnHjH8nRBYAaavKMuM= -=WfHu ------END PGP SIGNATURE----- diff --git a/libreoffice-help-6.3.3.1.tar.xz b/libreoffice-help-6.3.3.1.tar.xz new file mode 100644 index 0000000..a68d6e4 --- /dev/null +++ b/libreoffice-help-6.3.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cc5cba91b0712bcde016f6cfc5fee817c77c665f48e7e0ba3600e604fa50f82 +size 13193148 diff --git a/libreoffice-help-6.3.3.1.tar.xz.asc b/libreoffice-help-6.3.3.1.tar.xz.asc new file mode 100644 index 0000000..73c80e6 --- /dev/null +++ b/libreoffice-help-6.3.3.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2g1jUACgkQ9DSh76/u +rqMNyA/9GEPFJjmE+pAroNtcvHzrckYxTdH4+FaPB5rtxtWmWtDgZe+iExZMh5xt +weRsEP2tBXeWsSPqdt3XAAWtB2et4ZU3qquas2Bbb6I9/USwGApPcEPB0IzWHnKs +L0th0LGts/M7XTc/b93hQBfGWjL1mCZFbfrxxa9/2nAcpIclfM64hT9bJJwewu9Y +ncpiHTnkIR3xA3us7oSr+VK5nmQjuvi0HUJcbzZgu9PiYptFhfN1PqKhbbYT7Bnk +vUAFWGmjdZmaMTOLQJskfu8ReDlhJWtRIB+wY3LLP7q8veWLeBm5YHyalglBhZrt +K9SWB1ze+5FAjs45LPGKJPuOFvSsclhby7spHPRBvy4k4L4fwzGsGQ9h5LaYGSDl +WOw03zjYcb+P2CatbEkToeirtnAJ6tJfB63N1Lx0qhWypVhTX1+LxK/sFK+ckgit +yaewWutwsgVdywB48w90J0b4vRHQoKio41gjth5lCedyxDRqRB9iHoJsoe7pmv51 +bwW4jRBupVbwpOrQVrYjdWyr2pL6TjbdaPlWocOcfK7DnEjlRgjoNnUYBo9WLdXE +h/ubRAmbsrdIA6gn+kiUOQsJkf7KGN0P4pzChu6pfT2JPUk2P8d7spui5aXW9OnB +4wBTJNmuKC4Tcvzp9AHgNCIaYqDw3voRFyPe3dopfcFKVuvISJU= +=HBLE +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.3.2.2.tar.xz b/libreoffice-translations-6.3.2.2.tar.xz deleted file mode 100644 index 02020c5..0000000 --- a/libreoffice-translations-6.3.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d77f71de0f46e1698904cb9238b579a1bfce19c0ae0f165fc9fb695b9ec5973 -size 146414060 diff --git a/libreoffice-translations-6.3.2.2.tar.xz.asc b/libreoffice-translations-6.3.2.2.tar.xz.asc deleted file mode 100644 index 050fdac..0000000 --- a/libreoffice-translations-6.3.2.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2CRRYACgkQ9DSh76/u -rqMpkA/+KVaGu80jSMTNf6uNqnWqZQ8j1zQUFE6Tl08xpyt5J+YDiSpjkzZWHnAe -FOykFOwQlTD6xltXkhYiBa2W5hcJ0qZk0XwGPIYHm5NsZnCjQqKMMVJiv+M3gpLF -0sBZM36rIBHON76HQ8oRKXI9rTOBiNDtV2EeXafuD+vwhb1aufJavzz0SueYy/0W -tqlHPkuZc0YyhzGBHfmMMEKwUwLO/6kMTnqp8QiBG10TrCaf3FVAp5iTg261L2kz -UUX8ZVdUOAZPRV/Jp9iNGnuKlK5GKPoHDieyomqqkHeseJ3SC+xgw2AlRfTdJa8z -EV1HZIgp5R+GSSGGOYOQ5WlSR1iYLYsUmSrfdbyDouLlI1UBm/jhVK6jHUzOdOIj -25rc5SNQIm2eovV/IE17ayo2lGYhbtmFFhvCnG8TMQgEjKKRVAhxpdeDQJOQoejs -sVtKxp28UoPuUfyvdRt56GqqOl0O4mwF8yb/z4I0oh674XwnrtdpZYTSzdKlauQP -iaEWHgpjNdb6lEzhZhzf/vbvPDz7ZNDLXtCtB8Kl1LQvO0CiVC2xcL764xLu3KT3 -6tpIwqMBnNPJQaP63EwvtCFh+Ki53UkawvMOhqs/XWiIx4Ota9dtmwuk4z25Sbuz -3rFpqjuu1vTlfMY7z0YPoTQkSQb9PHLSL2KVF9kYrB7kftp8GkU= -=c+Hn ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.3.3.1.tar.xz b/libreoffice-translations-6.3.3.1.tar.xz new file mode 100644 index 0000000..14a9b34 --- /dev/null +++ b/libreoffice-translations-6.3.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebb7f280e508d75166ce52e44ea9fc59117b2d6bf165b4ef2a2e5c8e898f048b +size 146430188 diff --git a/libreoffice-translations-6.3.3.1.tar.xz.asc b/libreoffice-translations-6.3.3.1.tar.xz.asc new file mode 100644 index 0000000..977f91a --- /dev/null +++ b/libreoffice-translations-6.3.3.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl2g1jYACgkQ9DSh76/u +rqMzCg//ZwiYwY6DZC1JoMI6trQNk/k7RMGgHYBvuYwD23w2cc4otnexmbFWxzlp +XRw9F/QfLap99solUDh0BYjza8fxXS7kd/7TDTQtlN7L09gBfix6SHZIdqJ7bhYg +7yAsUFzOGvewG6f64Jovb1OuF4KeZtI6G7+ixd6SCtSA9AFVBtx5TA0Kl4PFX826 +TfYyepQwV0KLDO+opCmYy4REWBNs6dQtr6xG7+ydbj8b95y9SDNXQj/CsFjYcY4b +pfp/eQCLFHYgn1SVBNEOvdAOFlkbpU3lhQ9UGm4hnOkx+/NbNe98PjH4aJQHwD86 +rcs7QMCPhETc8DPAIZISbAVUrlnaxcZvkLMP47N4aKKm/i04T2psCdHbaWt0H8Sy +Kl3ZMQQEH1AzBHU7p22s3C0dmz6aF6xT4YYn5t10hS4dvNetuQVERSHD4Dv1M7ni +X8UVBHCQG6hn5LkmcbHsotnEGwgYxAMd5+YH0bBzl/MzGXdLeP3bqBtiZAuCws5D +E7YUAe2vhpXsH/kCs+AEJ+UDuNnbENh7p/rtHAJ7YOvIPGwddXtO+59k5lV+K4Xf +oSpprBX+H3OMPrAeyjMFWewZ9EWyK8vFNGqf6Vj5yHQHenLAyE5WjJKyY3aPJIuf +hDmCjvgJ+V6WTaRqIMaevnF5GtHHz2jfTGgm0rSis2BDCJbopRk= +=krJG +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index c6375c3..c332d83 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Oct 18 09:56:13 UTC 2019 - Tomáš Chvátal + +- Add mssing krasa_jaga_svg icons to filelist + +------------------------------------------------------------------- +Thu Oct 17 11:59:59 UTC 2019 - Tomáš Chvátal + +- Update to 6.3.3.1: + * 6.3 series stability fixes +- Remove merged 0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch + +------------------------------------------------------------------- +Mon Oct 7 07:42:34 UTC 2019 - Tomáš Chvátal + +- As gtk2 will be removed in future releases we are disabling it + on 6.3 too to test out if we expose some regressions while we + can revert back and enable it again + +------------------------------------------------------------------- +Fri Sep 27 19:53:32 UTC 2019 - Jonathan Brielmaier + +- Enable build on ppc64le. +- Let the test suite run on ppc64le and disable the failing tests. + ------------------------------------------------------------------- Thu Sep 19 08:36:59 UTC 2019 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index 6a571f9..fced5e7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -41,7 +41,6 @@ %endif %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) %bcond_without system_gpgme -%bcond_without gtk3 %else # Hack in the bundled libs to not pop up on requires/provides to avoid # faking libreoffice provide some system packages @@ -49,10 +48,9 @@ %global __requires_exclude_from ^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$ %global __requires_exclude ^libgpgmepp\\.so.*$ %bcond_with system_gpgme -%bcond_with gtk3 %endif Name: libreoffice -Version: 6.3.2.2 +Version: 6.3.3.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -101,7 +99,6 @@ Patch1: scp2-user-config-suse.diff Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff Patch5: mdds-1-5.patch -Patch6: 0001-Check-for-EMOJI-content-only-on-ICU-57-and-newer.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -170,14 +167,12 @@ BuildRequires: pkgconfig(dbus-1) >= 0.60 BuildRequires: pkgconfig(epoxy) >= 1.2 BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(gl) -# >= 2.4 is needed for bluetooth support ; >= 2.40 is needed for gtk3 -BuildRequires: pkgconfig(glib-2.0) >= 2.4 +BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) -BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0 BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 BuildRequires: pkgconfig(harfbuzz-icu) >= 0.9.42 BuildRequires: pkgconfig(hunspell) @@ -252,7 +247,7 @@ Provides: %{name}-icon-theme-crystal = %{version} Obsoletes: %{name}-icon-theme-crystal < %{version} Provides: %{name}-icon-theme-oxygen = %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version} -ExclusiveArch: aarch64 %{ix86} x86_64 +ExclusiveArch: aarch64 %{ix86} x86_64 ppc64le %if 0%{?suse_version} >= 1500 BuildRequires: libmariadb-devel %else @@ -269,17 +264,7 @@ BuildRequires: gcc7-c++ Requires(post): update-desktop-files Requires(postun): update-desktop-files %endif -%if %{with gtk3} -BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(gtk+-3.0) >= 3.18 -%else -Provides: libreofficekit = %{version} -Obsoletes: libreofficekit < %{version} -Provides: libreofficekit-devel = %{version} -Obsoletes: libreofficekit-devel < %{version} -Provides: %{name}-gtk3 = %{version} -Obsoletes: %{name}-gtk3 < %{version} -%endif %if %{with system_gpgme} BuildRequires: libgpgmepp-devel %endif @@ -569,23 +554,6 @@ Supplements: packageand(libreoffice:plasma5-workspace) %description gtk3 This package contains Gtk3 interface rendering option for LibreOffice. -%package gtk2 -Summary: Gtk2 interface for LibreOffice -Group: Productivity/Office/Suite -Recommends: %{name}-gnome = %{version} -Conflicts: %{name}-gnome < %{version} -# We are default if gtk3 is not present -%if !%{with gtk3} -Supplements: packageand(libreoffice:gnome-session) -# Without kde and gtk3 ntegration we provide gtk2 interface there -%if !%{with kdeintegration} -Supplements: packageand(libreoffice:plasma5-workspace) -%endif -%endif - -%description gtk2 -This package contains Gtk2 interface rendering option for LibreOffice. - %package qt5 Summary: Qt5/KDE Frameworks interface for LibreOffice Group: Productivity/Office/Suite @@ -635,7 +603,7 @@ Requires: %{name} = %{version} %ifarch %{ix86} Requires: jre-32 >= 1.6 %endif -%ifarch x86_64 aarch64 +%ifarch x86_64 aarch64 ppc64le Requires: jre-64 >= 1.6 %endif @@ -666,7 +634,7 @@ Requires(pre): libreoffice = %{version} %ifarch %{ix86} Requires: jre-32 >= 1.6 %endif -%ifarch x86_64 aarch64 +%ifarch x86_64 aarch64 ppc64le Requires: jre-64 >= 1.6 %endif @@ -686,7 +654,7 @@ Requires(pre): libreoffice = %{version} %ifarch %{ix86} Requires: jre-32 >= 1.6 %endif -%ifarch x86_64 aarch64 +%ifarch x86_64 aarch64 ppc64le Requires: jre-64 >= 1.6 %endif @@ -986,7 +954,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch2 %patch3 %patch5 -p1 -%patch6 -p1 %patch990 -p1 %patch991 -p1 @@ -1005,6 +972,14 @@ sed -i -e /CppunitTest_sw_uiwriter/d sw/Module_sw.mk sed -i -e /CPPUNIT_TEST\(testODFEncryptedGPG\)/d xmlsecurity/qa/unit/signing/signing.cxx # breaks on LTO https://bugs.documentfoundation.org/show_bug.cgi?id=126442 sed -i -e /CppunitTest_sw_apitests/d sw/Module_sw.mk +# Disable failing tests on ppc64le for now +%ifarch ppc64le +sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk +sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk +sed -i -e /CppunitTest_sc_dataprovider/d sc/Module_sc.mk # https://bugs.documentfoundation.org/show_bug.cgi?id=127099 +sed -i -e /CppunitTest_sc_financial_functions_test/d sc/Module_sc.mk # https://bugs.documentfoundation.org/show_bug.cgi?id=127083 +sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk +%endif %if 0%{?suse_version} < 1500 # Header-only libboost_system is not available @@ -1080,8 +1055,8 @@ export NOCONFIGURE=yes --disable-online-update \ --disable-gstreamer-0-10 \ --enable-gstreamer-1-0 \ -%if %{with gtk3} --enable-gtk3 \ + --disable-gtk \ %if %{with kdeintegration} --disable-gtk3-kde5 \ --enable-kde5 \ @@ -1089,9 +1064,6 @@ export NOCONFIGURE=yes %else --disable-kde5 \ --disable-qt5 \ -%endif -%else - --disable-gtk3 \ %endif --enable-introspection \ --with-doxygen \ @@ -1146,8 +1118,8 @@ export NOCONFIGURE=yes make verbose=t build-nocheck %check -# Run tests only on 64b intel as they are resource hogs -%ifarch x86_64 +# Run tests only on x86_64 and ppc64le as they are resource hogs +%ifarch x86_64 ppc64le # safeguard jarfires that can get magically overriden by the make mkdir savejar cp %{buildroot}%{_libdir}/%{name}/program/classes/*.jar savejar/ @@ -1164,9 +1136,6 @@ set +x # 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 -# also split out gtk2 interface to make sure we do not pull gtk2 for fun of it -grep -v "%{_libdir}/libreoffice/program/libvclplug_gtklo.so" file-lists/gnome_list.txt > tmplist -mv tmplist file-lists/gnome_list.txt # Remove firebird connector from main package filelist %if %{with firebird} @@ -1339,17 +1308,12 @@ rm pyfiles.txt cp %{SOURCE6} %{buildroot}%{_libdir}/libreoffice/share/palette/SUSE.soc echo "%{_libdir}/libreoffice/share/palette/SUSE.soc" >> file-lists/common_list.txt -%if %{with gtk3} # Symlink gtk3 libreofficekit to libdir ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/liblibreofficekitgtk.so # Libreofficekit headers mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/ install -m 0644 include/LibreOfficeKit/* %{buildroot}%{_includedir}/LibreOfficeKit/ -%else -# remove files that are not supposed to be installed with disabled libreofficekit -rm -rf %{buildroot}%{_libdir}/libreoffice/share/libreofficekit/ -%endif # Symlink uno.py and unohelper.py so that python can find them # This is done after the cache files generating on purpose @@ -1460,7 +1424,6 @@ exit 0 %dir %{_datadir}/icons/locolor/32x32/apps %dir %{_datadir}/icons/locolor/32x32/mimetypes -%if %{with gtk3} %files -n libreofficekit %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/LOKDocView-0.1.typelib @@ -1475,7 +1438,6 @@ exit 0 %{_datadir}/gir-1.0/LOKDocView-0.1.gir %dir %{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit/* -%endif %files glade %dir %{_datadir}/glade @@ -1522,13 +1484,8 @@ exit 0 %files -f file-lists/gnome_list.txt gnome -%if %{with gtk3} %files gtk3 %{_libdir}/libreoffice/program/libvclplug_gtk3lo.so -%endif - -%files gtk2 -%{_libdir}/libreoffice/program/libvclplug_gtklo.so %if %{with kdeintegration} %files -f file-lists/kde4_list.txt qt5 @@ -1561,6 +1518,7 @@ exit 0 %{_datadir}/%{name}/share/config/images_elementary.zip %{_datadir}/%{name}/share/config/images_colibre.zip %{_datadir}/%{name}/share/config/images_karasa_jaga.zip +%{_datadir}/%{name}/share/config/images_karasa_jaga_svg.zip %{_datadir}/%{name}/share/config/images_sifr.zip %{_datadir}/%{name}/share/config/images_sifr_dark.zip %{_datadir}/%{name}/share/config/images_sifr_svg.zip