From 259d02a531d68f5d31afbb286ca87a516af6ddf0ba7dc4a3237a0976b1a26086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 8 Aug 2019 08:30:51 +0000 Subject: [PATCH] - Update to 6.3.0.4: * 6.3 RC4 - Make librelogo standalone subpkg bsc#1144522 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=805 --- libreoffice-6.3.0.3.tar.xz | 3 -- libreoffice-6.3.0.3.tar.xz.asc | 16 ------- libreoffice-6.3.0.4.tar.xz | 3 ++ libreoffice-6.3.0.4.tar.xz.asc | 16 +++++++ libreoffice-help-6.3.0.3.tar.xz | 3 -- libreoffice-help-6.3.0.3.tar.xz.asc | 16 ------- libreoffice-help-6.3.0.4.tar.xz | 3 ++ libreoffice-help-6.3.0.4.tar.xz.asc | 16 +++++++ libreoffice-translations-6.3.0.3.tar.xz | 3 -- libreoffice-translations-6.3.0.3.tar.xz.asc | 16 ------- libreoffice-translations-6.3.0.4.tar.xz | 3 ++ libreoffice-translations-6.3.0.4.tar.xz.asc | 16 +++++++ libreoffice.changes | 7 +++ libreoffice.spec | 47 ++++++++++++++------- 14 files changed, 96 insertions(+), 72 deletions(-) delete mode 100644 libreoffice-6.3.0.3.tar.xz delete mode 100644 libreoffice-6.3.0.3.tar.xz.asc create mode 100644 libreoffice-6.3.0.4.tar.xz create mode 100644 libreoffice-6.3.0.4.tar.xz.asc delete mode 100644 libreoffice-help-6.3.0.3.tar.xz delete mode 100644 libreoffice-help-6.3.0.3.tar.xz.asc create mode 100644 libreoffice-help-6.3.0.4.tar.xz create mode 100644 libreoffice-help-6.3.0.4.tar.xz.asc delete mode 100644 libreoffice-translations-6.3.0.3.tar.xz delete mode 100644 libreoffice-translations-6.3.0.3.tar.xz.asc create mode 100644 libreoffice-translations-6.3.0.4.tar.xz create mode 100644 libreoffice-translations-6.3.0.4.tar.xz.asc diff --git a/libreoffice-6.3.0.3.tar.xz b/libreoffice-6.3.0.3.tar.xz deleted file mode 100644 index 17fd059..0000000 --- a/libreoffice-6.3.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb51cfadb0454be2877e7bbcd6775d26070b17d5b243aa5061be7893633fe996 -size 224507528 diff --git a/libreoffice-6.3.0.3.tar.xz.asc b/libreoffice-6.3.0.3.tar.xz.asc deleted file mode 100644 index e8daaea..0000000 --- a/libreoffice-6.3.0.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1B8xkACgkQ9DSh76/u -rqMFshAAyAXiQgt2fHcWDsYqQ7JdJkpn+vXNpu1SyrSv2t1OOrSkYfMLPE8shQ+u -sHD89l3JVXJa0VbxiwFMPoihcl/iSLOtiOW+YuDi1M3dV9gZeGqBiwjJ/bJXvDZd -7H/VaY+hGX3PX75xo4RMIsjuhrUXZZZvUfh2FuHBq7bAtZK0p+hXnxUP3WXxfthA -XRo4JUX+fZHvjbrjNye/4yy7h0i7wGHV6u7UwyEoGZ2qkt9yUftO6a+ptfHdjTHP -WLa4Pg1v+kXw8WaPZJDR7sIbhGPXVHsygKcdBNnuWnsqxCfVYvnxlGWzZ/5dno4Z -9Pkxi/KUOR9BUG5MCyacYRxJY9Yb6rmgAGiO39p+td7f8yec/Wzdpb/Gx0RmVFEX -uOjUbfDj10NssQqSRM3ek/07OgDQPIziN2xpBtMEN01XM97qfVwFwjlg5BadNg5R -9GkkxmzWxxxO1B4JwYDHNRgurlSjPg5DAI62pfFzil0MEu47IAva16WyBtmq9Ish -tkXEaGMA3NUt/Hfjr2FX0n/bxgnQeKRrZEeaqDiiKHIOnt7XTSNRYLxucu5gYPYl -azIdJ1QTMLeBGMzrl4rTd++mzTrlbld7SsZtTSWuhcJjgKiwvs69K/ImZ3zpX37h -xWv35Ob/0BLWcxZ7eNjzpJ61k4mTp62S6LhP7uZgrsAtVJj+jeE= -=2ku1 ------END PGP SIGNATURE----- diff --git a/libreoffice-6.3.0.4.tar.xz b/libreoffice-6.3.0.4.tar.xz new file mode 100644 index 0000000..d7ce438 --- /dev/null +++ b/libreoffice-6.3.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87830107b17fbf6c3831c8e6bf738e7d21fa7826debb88e4948d80caf2a7aed7 +size 224504440 diff --git a/libreoffice-6.3.0.4.tar.xz.asc b/libreoffice-6.3.0.4.tar.xz.asc new file mode 100644 index 0000000..a700e64 --- /dev/null +++ b/libreoffice-6.3.0.4.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1JwoAACgkQ9DSh76/u +rqNt6hAAqKS8z6mHLAHmUm648tFukr8DDfcX8+GfT9qAm78wOdISDgo7quIG4pL6 +NRRYZvWS/YimY59HFdBC9GJbVlPULLOHPWhKEeejky2FjjFwDB/5lTS2sO8/cMBO +/gQX/JZhA//UqWLWBjTXzKeitye53yF0wSLVzFKYu8mQpydpAtFpyMx1Zn8VHpOK +wSxsr8yXjVn0DloIxaHWNm43FOcNNiZEz8QgmizYxfmCzbjNkLYcyUmzylWXG/YL +bYVMk+RyQhu1MASjQn5pxI6W6mP7Eb2ZN+E89GA4MtFHr7sNV1yKA4ur2HpGUy6m +I+mhk3iMMVqyQhLykLSs1FZ0rfEIqY0ZQmNFnXwpQRNPrMDlznxGZHfi2mohXXuQ +UNS2kuWJCqqz5qxvLcLjTJiN2zw9bAs0e4nAqSRMw+VAGtgGOaKEzJJXFrFBWgyF +o6qmb7U66V0sK3lb3lW1BxNXKscrKg3bZZkKFvgE3lxlyZsswm2IhTTkm3X1Zgdl +UTbxo1FOnkqllUt0uKmmjxxL4ybHSSVClL9hJH4ixbGxcIT/aQkxrZPKBT66vp2D +AqtR5GFM54simCkhlRqv7H3EuCIkRPYedRf2u9KsYSveZorAF+r24MCE8HBr+5jM +zXhNtY3U1EYGqHoIqgsHxyJmlnetEmyWuux5AEhRpnVBu3Qnf9g= +=phCq +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-6.3.0.3.tar.xz b/libreoffice-help-6.3.0.3.tar.xz deleted file mode 100644 index 4f587ff..0000000 --- a/libreoffice-help-6.3.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a056600e448df90764449ec28b4e4a69fe2c53791b606f893fdbe0e2ed568f7 -size 13191228 diff --git a/libreoffice-help-6.3.0.3.tar.xz.asc b/libreoffice-help-6.3.0.3.tar.xz.asc deleted file mode 100644 index acee728..0000000 --- a/libreoffice-help-6.3.0.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1B8x0ACgkQ9DSh76/u -rqPMVxAAw0DkHIwiQ7A+qizTF10bTr73dUaQWVVkMDahUz7YM2W8ObtxDXlJsm1h -nxpNU3Gb6betL0SxhpGv9gFdPFGK7NqV29XAcB+b5EcBxRsoJ5lR//Rl+8jMniCy -C8sGlhYDsQ2Dxz4IXpLUSRt5BOG9hYMSmL1JnPZK9z3+qbKO99xE0keQdvybymJT -kCUvfd0RAwmPPfqqOMHRRXm45Un4O0F59UnaB4wCCv9E/674YByywUwcXEZZb8lY -/lLSlHkrsZ7YEyIfejZEoZKL9nBvBHrH2TZwkEpGthRZX0iY1ReJt9B66bPilOxc -eDEjP3MO7F7x+3nszMIi+V0EbgLRBW+Bv+ETOEZLikA7dqY8Ob+WJulzi2qAPzOm -DrwshgqL+2yR5OjvFzYpkfA/SZ5p/rDfm6hA8yVVVmwjIKR0TjNX32I+hT8Is0OI -Cq6n4p84CygXYDuOwZVHb4TCAPdqkdcBqRzURgL53gAipxs0lzhOUD0C4WTKUfAr -SxdsHWek6BlnDzJ2Q5nv7Ofig0GY2WfxudiNMbsirNMw0I/UqWbl7aGAxMcqr+g0 -B8CLrfAnJIImftTEJaSRaW5cKaDcFhdGfuUcAAZe7fqqDZ7NRcTeH9y1Llh5ayYW -Eyy1TKkmlnAy+VYDw4jxG+HBWKE6JQk/H5XV0++v1bkSDkl+MXE= -=kNyn ------END PGP SIGNATURE----- diff --git a/libreoffice-help-6.3.0.4.tar.xz b/libreoffice-help-6.3.0.4.tar.xz new file mode 100644 index 0000000..f2b69ad --- /dev/null +++ b/libreoffice-help-6.3.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f5c5dac7e6d4fafe8b7e14d8b67454e4773cd0696be967cef7b97f33fc72bf1 +size 13191436 diff --git a/libreoffice-help-6.3.0.4.tar.xz.asc b/libreoffice-help-6.3.0.4.tar.xz.asc new file mode 100644 index 0000000..896bb2c --- /dev/null +++ b/libreoffice-help-6.3.0.4.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1JwoQACgkQ9DSh76/u +rqOebBAAmNy/uupc/v3BLwIMZw6ZjT6kmi9h+ZAZdJJgTsScf1B0R4pgeV0TNrne +s6qrgCo2A6UL4lirZ6aRx73N7sKtVPCQto0X3pSD+fVhyAgM1s0GMJV82LQQLAxU +Wm1K8tIAAtujdPSBm6yQv87J4qL2O6xiqR+PT6G/DdAJ+dIPX5LRbsQAQr/GGYxp +07BkodDBcM8efbLdY9/FIMx4nGuu7B+XmotRbPMEy49foYKkmSafkS/0xXPKI60R +SoI2w0vCqhWqw7ffMMdyrKDxdsNUfX31bSdZPoZklwGuXYPRemvayf+RIhgUh0ps +bXLbc7DLKsvPHA4TIkPI9N2zHhBkD0EXugKl0lwUPGmABhLvqJbMty0KwTDWazxq +tlijbCBpM7Uf1mr3q7Gknp+Ej3VP+2l1hSIyYxv/cAnevM8LAU53rYf2XyA72lrX +8bKVoBw9lbb+6EHLsbT+mCIqyW5VpvkxKE0sy0wi3EuUbRx5s/0H1aDMGFhI6czc +DxOOkFSCRomgqN98Xsr1wgawUxtc0iqo8j7ROCTncBg4TgsXmG/wonR8x0HKsMfq +CqTChi181/SZmwpdiIYHENZAM4e7qtaD0zqPK4ctB7pphUAFcnWb2h7FUfU1WtR4 +QaZIkYABcO9mW03V5ucz7EFpylx9JACh74r9EpCwGJhBtizIuJ8= +=PY2j +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.3.0.3.tar.xz b/libreoffice-translations-6.3.0.3.tar.xz deleted file mode 100644 index c6ba127..0000000 --- a/libreoffice-translations-6.3.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a06e45d0c46dba020c00a10d3a41ee29e749e3101f16bc709b14d4094898ffce -size 146225332 diff --git a/libreoffice-translations-6.3.0.3.tar.xz.asc b/libreoffice-translations-6.3.0.3.tar.xz.asc deleted file mode 100644 index 7213b27..0000000 --- a/libreoffice-translations-6.3.0.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1B8x4ACgkQ9DSh76/u -rqPCkw/+Il4bJ3TaVtjKQOX/RDRHg5nxXSa5KeZKHzWUiUPIF8JVWE8sV8kuzqmp -lASnpfmJL3FIwtRLuudGMYdjAXeqLahQMV7uVjSBb4XZvCPT398CEnJOTGZ+0JwS -p7q42683Eo9/jwwNTEc1s6fPnJK6rTHjWMWREvLI+LHoRbE1r8OzbM+zjQBhoR0+ -2V9qH0GkaiUXuFMCIWyvBdwRc6A2906J+qtBmmvp0kciZ21HsnOeBpcPDkKfqt1v -Ji1/7Q+g27QxXLJzqQkXq8VK2qF3KEAScvieNcQo1dS9fjLYzDB4tjKwrx20mQwU -EXQh8txkjQprg6zMwqHJJfy7jA9WxhtaeHzVTSvNn82sxf7y0yzoQ8dG1U360eIn -bYyghqyjyBJ9LJZvPsLHjJUl4tqAWkDoyyoLS4HjBcCOOeo448YjQ0appCLNrQ6W -NuEQCnyNLTNE4w8F274k8nwbOZeuXBxpEP0VWm/W0HJPYaBjGCV+6FvogCzOuIdj -e9vRHVF+PIraVG1pOJdYgLLgrVMAciKj2etXAxBcexbKYk9TW1JdRDrZL8WIWBsO -k68bebCnrbu7hXQko60diFShSDB/KwZi1fQsr0TimcOrxwffOaPq7bmE5xO21Chj -aF2YtPSZ4xM2HRAgsl/CZ9DphDx5Gort5XbtdLdA4JXhonFBoKQ= -=SVy0 ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.3.0.4.tar.xz b/libreoffice-translations-6.3.0.4.tar.xz new file mode 100644 index 0000000..c648418 --- /dev/null +++ b/libreoffice-translations-6.3.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:090098f72f2c153ee361e9a01f7b2593b0447e93bf4d694a130b803c0577601c +size 146252828 diff --git a/libreoffice-translations-6.3.0.4.tar.xz.asc b/libreoffice-translations-6.3.0.4.tar.xz.asc new file mode 100644 index 0000000..92b2e08 --- /dev/null +++ b/libreoffice-translations-6.3.0.4.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl1JwoUACgkQ9DSh76/u +rqPoFQ/9FdehUSphZxeiclnzKXBoF1YEs+hvq+k4sDwUEfE2lJulZAlahJbFAYWP +goMTIwAmHTR3jhaRt4V8sldDFSEo80s9y+GBXjVyEmeorZcr+yEqfy/YIW4JlwpO +25fujPkUcDDnjcgQ57Q9NdgxwgmU7WYd3NsSN7XCjL7gHEs4ubQrkR6h4A2UF72w +kS6XcxL3xZl0dNetMVX0/bu/n8OwJtRR3wiPRePatNBXFGmqgtKBhYUAXJFNbNWy +k1TFnfCgDB+nQRVyskQoE8w36eZwHuqmRhTsJG/gOITvOo/AV9kbqgIPXVg04iP9 +GlJczl7RlH1SiJxMCj+Snva/jvTdvZDJEVSIooVz6ZSc6gUfccY1xxeMm/9TC8JY +NEHrnDwzRlQni/nIsBwctZPcrfMHARUdJVMug3vPglsqy08ZSaVtGwK9UoKG9/E1 +Hvc8JDVe3sPL3vHaxrCoQKcCX9PuhoS1jp7FW7ujiSOf74ShOVY8zAmEum/RuS/u +AOF8AeuqERPOlfzDjuhwZmFKcRv8qu95JtlzQCrH1LWWoqUemxTQsp5Zsh+hQBO8 +bMO+bsuZPg7AhP+cnFFO/JxTli2G5TBBwQVoWYqogGozzWxlBxboqhTw9DMC6PNx +UGfKvOKdjgQbOrh4FrSRf9r4wvEAb4P1TKy+n9brUeBsZxchSY0= +=wxx2 +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index a2fc43e..2ae5487 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 8 08:23:33 UTC 2019 - Tomáš Chvátal + +- Update to 6.3.0.4: + * 6.3 RC4 +- Make librelogo standalone subpkg bsc#1144522 + ------------------------------------------------------------------- Thu Aug 1 15:03:55 UTC 2019 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index 0fe1a6c..e9ae119 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -52,7 +52,7 @@ %bcond_with gtk3 %endif Name: libreoffice -Version: 6.3.0.3 +Version: 6.3.0.4 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -124,10 +124,10 @@ BuildRequires: flex BuildRequires: flute BuildRequires: fontforge BuildRequires: glm-devel -BuildRequires: graphviz # Needed for tests BuildRequires: google-carlito-fonts BuildRequires: gperf >= 3.0.0 +BuildRequires: graphviz BuildRequires: hyphen-devel # genbrk binary is required BuildRequires: icu @@ -142,11 +142,6 @@ BuildRequires: libformula BuildRequires: libjpeg-devel BuildRequires: liblayout BuildRequires: libloader -%if 0%{?suse_version} >= 1500 -BuildRequires: libmariadb-devel -%else -BuildRequires: libmysqlclient-devel -%endif BuildRequires: librepository BuildRequires: libserializer BuildRequires: libtool @@ -258,6 +253,11 @@ Obsoletes: %{name}-icon-theme-crystal < %{version} Provides: %{name}-icon-theme-oxygen = %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version} ExclusiveArch: aarch64 %{ix86} x86_64 +%if 0%{?suse_version} >= 1500 +BuildRequires: libmariadb-devel +%else +BuildRequires: libmysqlclient-devel +%endif %if %{?suse_version} >= 1500 BuildRequires: gcc >= 7 BuildRequires: gcc-c++ >= 7 @@ -404,8 +404,8 @@ Summary: LibreOffice Base Group: Productivity/Office/Suite Requires: %{name} = %{version} Requires: pentaho-reporting-flow-engine -Obsoletes: %{name}-base-drivers-mysql Supplements: %{name} +Obsoletes: %{name}-base-drivers-mysql # default database connector %if %{with firebird} Requires: %{name}-base-drivers-firebird @@ -536,6 +536,17 @@ it. For example, it is used for the mail merge functionality. You can find the more information at http://udk.openoffice.org/python/python-bridge.html +%package librelogo +Summary: LibreLogo scripting language +Group: Productivity/Office/Suite +Requires: %{name}-pyuno = %{version} +Requires: %{name}-writer = %{version} + +%description librelogo +Enables LibreLogo scripting in Writer. LibreLogo is a Logo-like +programming language with interactive vectorgraphics for education and +DTP. + %package gnome Summary: GNOME Extensions for LibreOffice Group: Productivity/Office/Suite @@ -548,9 +559,9 @@ This package contains some GNOME extensions and GTK2 interface for LibreOffice. Summary: Gtk3 interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name}-gnome = %{version} -Supplements: packageand(libreoffice:gnome-session) -Supplements: packageand(libreoffice:mate-session-manager) -Supplements: packageand(libreoffice:xfce4-session) +Supplements: (libreoffice and gnome-session) +Supplements: (libreoffice and mate-session-manager) +Supplements: (libreoffice and xfce4-session) %description gtk3 This package contains Gtk3 interface rendering option for LibreOffice. @@ -562,11 +573,11 @@ Recommends: %{name}-gnome = %{version} Conflicts: %{name}-gnome < %{version} # We are default if gtk3 is not present %if !%{with gtk3} -Supplements: packageand(libreoffice:gnome-session) +Supplements: (libreoffice and gnome-session) %endif # Without kde integration we provide gtk2 interface there %if !%{with kdeintegration} -Supplements: packageand(libreoffice:plasma5-workspace) +Supplements: (libreoffice and plasma5-workspace) %endif %description gtk2 @@ -576,7 +587,7 @@ This package contains Gtk2 interface rendering option for LibreOffice. Summary: Qt5/KDE Frameworks interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name} = %{version} -Supplements: packageand(libreoffice:plasma5-workspace) +Supplements: (libreoffice and plasma5-workspace) Provides: %{name}-kde4 = %{version} Obsoletes: %{name}-kde4 < %{version} @@ -1023,7 +1034,7 @@ export CXX=g++-7 %endif # Fake the epoch stuff in generated zip files -export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) +export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%%s) # Colada does not have .pc file and configure creator was really lazy export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser' @@ -1497,6 +1508,12 @@ exit 0 %files -f file-lists/mailmerge_list.txt mailmerge %files -f file-lists/pyuno_list.txt pyuno +%exclude %{_libdir}/libreoffice/share/Scripts/python/LibreLogo +%exclude %{_libdir}/libreoffice/share/registry/librelogo.xcd + +%files librelogo +%{_libdir}/libreoffice/share/registry/librelogo.xcd +%{_libdir}/libreoffice/share/Scripts/python/LibreLogo %files -f file-lists/gnome_list.txt gnome