Accepting request 638017 from LibreOffice:Factory

- Version update to 6.1.2.1:
  * 6.1.2 RC1

- Switch to serf from neon package that is quite dead
- Remove sysstray configure option as the code was removed

- Update to 6.1.1.2:
  * 6.1.1 RC2

OBS-URL: https://build.opensuse.org/request/show/638017
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=164
This commit is contained in:
Dominique Leuenberger 2018-09-26 14:02:27 +00:00 committed by Git OBS Bridge
commit e5df977df2
14 changed files with 80 additions and 62 deletions

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbgD3CAAoJEPQ0oe+v7q6jNsAP/j2PtSZmczJMwqufU5JmVxqc
7/dPhAIDwrxKcGuKHjswPfY0GfCAQfSuJW17CGRs/8uSdwlUMkG4T1ih66AXuqx/
lu6w+ooc7RXMQZYOWJE1Br+vdZx63hv09XUb/CWuHGYPh826BygCRFF9EzO/2tpo
RW1Ldj7yAq1EQ8m1pEPhuRHpkYZufLntsvU8nwYg0auiQxN13vQu55BKeyCBDiYg
wP3FgHJss24v/Y9/AxdWGXmQ48yfaoOlKcNu/5g7AS0rWFFRN5PwUMSGyaAevBY9
iM2aG6z02oEhq3o3TXAXd3FX3Ff1gqJhfXOUCV+5prpY8zJEYiTQH9wes2NNlj96
8KPS3w7M4nh9IuFbPSTzB4YmvuLJsjD12a4ien1D0npFMl4IMKxhfb3Lx+6+Uw8q
H93ayCbCi5NvFvAwFLYdhElP/ab6rGbozM4Ic6C/8bjehIDx42YsCCGRtuut/pRs
kKoGu3LyFL1nGCzwdvLpkyqs6KK4EXqvOhJNjcnQTpceI37HEaBd70k+f6uLlURE
Y6bZ7mFzmNmuQNKIfxx0IZTTHI4pNXbDlEME/xkuJB1BePN5qgXZlOae9K5NiFlE
WbwqXCJ+d4OW+Ov/hbKiU0n41auKpMJPY8V1E1yx4XOukYwgDgTF+1z3OTPoZvOx
pgqHbVtg8WsTzZB8fGah
=JxM3
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbo3GcAAoJEPQ0oe+v7q6jnyUP/ihMcFi+22birdoCbuDBiRBX
sTWS11EW6l6bp+vekjUQ/sZdIMWM0MMi9ElnYOEb4NWCXLEJUqzbqsUHBUpMFCw9
ELiDXxBKNvgs1FrqcSoXfX6M4FhiGHi3QGfEh6kF1+en6h1axojz79YcrrhAPhel
oGdahMb0/lBHczWSxlwr2qSykOrV0Y26Aqmegb8eomrJR2SSeqDNLYP0qFplwQts
QkHBgNCFpjZhcRFua//1amSoBRLuJ4bYb+M130G6NtTCCl/WOGW8iuYmQpakeQh1
yCU+u87dc1NRxz7N+jU1F9YyKsMqeRxouHz3l3FUZfqMTtEwhs1vMx9UahTyHg6L
rRJ7VKLRB0IvN6ygLhdZYRXOG4667fVMFQE69NWfitk7Mpveet6oQC79b/TmIYLE
Qnyl3Bpcp9I7yfdl0sJi+QuhsNilPiumucKRFf0cD8Lew1z83flLVM8LH3DDiwBz
yP+tMpZ7yZjzmNilLxF94iH0hBk0PhARlaERw1bJhpUla5iHVGDyk6fOjxRDputU
moTCztNlbJdPFQSFhE5GjUZoMQKTrdzfp7x5BqpmGBvKH9v9AXFihUVN7PoHuWRa
j86G2zIdjzMmSpP8K6TIXlVCv1O9aut0dorZU92g+f84VcuXrW5hlFQydqCG5eE3
8pW2AO2AdtKc4BzsFzBh
=KNVX
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbgD3OAAoJEPQ0oe+v7q6jbiAP+QGbQFiMKYkyZxD8exlmEH+B
as+0oPpGk2NFmnfs1RYD7BbZj7jCmM6/1ukhPvQKaHIoCZBgpVLidl2/voqtR3D4
vWlbW2D5z1WT6BMBpryCE+Ir/kXhsT+V3oWEGThLXlI74bWTxy2LeHU1U+hu5cwG
B4045jK/U5QQHOX48kxn2xTExc6PXZlagRHSFmTocoFYwh1xCJiif4KuXIN2AyRL
OAmSyY5k+QARu3o0ehwUcRGxi1KBDUZr3iEnktAyFaWRhR+/Ia9vfHpEYCYxNoLx
olA2ZMBj/w3u8NADYgF0s2vdFviD9M6sypI8e008N8BRFcyjmkZL7WBUJCYbYfJm
iR2zsCBxXf6qHu0e/C/nnoy45eoIp4z5s22hs7grGElvAegeShDhmSODEQENWFOW
V6xTzzTxJRoHIxJT4FJrsk+h/SdRRjmnux929NqLTrmgbSErbAa0ajC87CPCWbM9
iL22DzsfiwSn6mtVmtaYawHlk4Y13nYff532HOMB4mMOtPWWIDafXVEt64437qi7
xB4VhVvXNVitc7W0g/FL0PQJNXIa9IHZUR1qmop0bBgsZEu/tJPTe/HN4B1qqGlS
K23gH+FM37N54p/MUHze70eXxqSboqCfeKfjzhot5WSBnJ51xvE4RkhNpjtwN38n
N3qmJ0pOilCwgiwqLnHH
=OYmK
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbo3GjAAoJEPQ0oe+v7q6j9P0P/iVOdKg2uq0d2MpNYjBT7nPb
3zw/8AyviALGBBAKBirwL1Ja4Xsax1BSCMoSJSUulpIB8RB+vTGR8fAS9duyymXB
Fccg3hLb4csDRR4KnKn+xMw7ZEQPhE+zu4LvREnaevXXXFSji5j4TAikS8kGCzgQ
YhFDS/kn34v61I6jFgMiCD16PIAxW5UOHZtVGSvvVUllkwwzZ0TG5sGcPQsCquX0
awacuuNpN10+QMcDp6U/ktwfBP3Tzc2eL4NtG9iX9v/gkaU/EiWUbmiumU+C6ifj
84MY9KVqAKPzrs+r2td9JJxEmYe3nCs3QVmX0RlTICYv5s/z1TQjXLOx/TdQpiOp
RdZqD0ovIQ/54H2dHI3mzAjsNuNYVvWiOufffgZWY4162NYwuwIikDoi3mKuRDeA
lFZB9eFB0TWgdutmmKnFVDI/xkTZoQqiJh0SRxkNTNXX4+0OQ2KiBNjb8n6yoEmM
Ykp5PWXdIIUydLhYnIBwiHjbZyHXODtANYAYDf/0vOi/7o/qamd7RMg03sKgzwdZ
NpubECWHn+WgQ2/6qJNZHbPOrzHuk1p3bc+8TFwOY1sI5fh/V6WJNGp9rXgFfeWG
AxEDdDfHiRL0zWp+4opvheESrt8mo1HzkiB3ZmmcT3wbbAXj35OyZVhxYQCkggj6
J+yn4/guFJq2p3uE6MrE
=h0gr
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbgD3TAAoJEPQ0oe+v7q6jqyQP/ikKPcHA/+ca33504SoyahBN
N7eWGKEioLXs0tzqmtUWCJl5ZwPF0lyxTNAS0K7MJjBYcvIbmpWQXfbnx4+FyUl+
K/sA+16MVmKYUQzfW6GM8AH4TqCncQaBh7IotsHartCYbMg4gs5ULdCjD4BfqPxO
olGiK+ChM14xXq6ds2WIYq1FZS3sUMRGmPUi7C7mez3Vvhm46xhnx1ehppId9Bsg
aP+bY4t0ZDc3D1bZXKCMIQo1/x0u6MVsW2bwg8Fotaw1b3G/6ZMb2KgUfYopGEFc
wxBFepwcDVX2yjOylkRNt+U6srz8GFbXGEMQc3X9u7uPWyfebColLVnaNCBNvP0Q
xrDSZzMQVl/NRSjmv/9npv+tocS1gdzXd0ZKBGM3Agv7+JIUQnbV0uRrueqhkApv
kwO7VwrY0u74KTE6Z6RTQ1oL7adsed1AFyijx+myW3awRQi46/qA+zp7/r+O86lQ
1kE/bssSxLcIvvxLdaFmiYLXv2ujFiLDcQ94WzuPZ4cGlWPKXqVunQdDoLZuFfLQ
C4IauUvsfT8ODC+9vvwY8jsTDYJle0XXNq6b8A8T++lgHVWRPIHFPUcl1ZqyIaCd
v2Dl/GqQmYuVC7ucw1E3lZ1LqbwesLQ9pB/LpYNByvbQp+llF8oRTQTVAcSpwUlE
6BDF7o21khktB+D9opYi
=M1Qa
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbo3GpAAoJEPQ0oe+v7q6juWgQAIEWFrZw4Bxt748tHLTwvIvj
5JoH5eUNKa04LLEvde1BJ3M5y0jsT8sJWKaF9Nks3qDYx3tzx7mN4BI+A4OxzsyG
FY7qeeBU3my/wS6r4EPfpy7yln+HuXkDfvv+/5tdGytnw1voCRBAHBGrqltXm5g8
36yp6kKpiPoNyiukP+LgD7xOgUp5rdxxVv1TnlmOQwJ81rvT6xEfFKv6GOZxmE9O
43d0W5kaHozUusUtKdCCd4k7/bsFynaHWqrqMTg1K6tWVw8GxdbpH8RUMgZGLDM8
dHoSJB+PtrYoPjQHuqFYa0rA98VdhMEVJoE+qtPSylHVPNsYogm0HcUwr2qgGo9+
+GWLk9uJ2R9Q/58kzTNhUFSR4GH5u+0QN9jJRDoEVnQ/62Bp+Xsg7DqnW83JqmON
gFeVAqvpokVStnH0XjT16RluVxNrn/S/PsphqQwiB6y8R4DTBqA3EgCQ0L5peG7x
KvAbuTfbdbpUlQlKFxK0neEsxmjE1j5wJ8pbBX5JDnx5AKkgWFCm89RsWcFvtsCK
E0bLBmBfyIfrUBj9ujeVbfYba+ocTgbdMkEIHnNG8UVgiBHlfNIv2QHXLfG+54w8
/2J+zMF8/5/+Zd28ihs0KSA7xipw5mOzOqD1bp7qFYdlldIr3Li+az21fK8i3hQ0
Drm92aq3YuxR7V7vP/Iv
=jlV6
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Sep 25 11:13:11 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
- Version update to 6.1.2.1:
* 6.1.2 RC1
-------------------------------------------------------------------
Tue Sep 18 08:20:09 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
- Switch to serf from neon package that is quite dead
- Remove sysstray configure option as the code was removed
-------------------------------------------------------------------
Mon Sep 17 09:30:11 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 6.1.1.2:
* 6.1.1 RC2
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 29 08:00:51 UTC 2018 - tchvatal@suse.com Wed Aug 29 08:00:51 UTC 2018 - tchvatal@suse.com

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -52,7 +52,7 @@
%bcond_with gtk3 %bcond_with gtk3
%endif %endif
Name: libreoffice Name: libreoffice
Version: 6.1.1.1 Version: 6.1.2.1
Release: 0 Release: 0
Summary: A Free Office Suite (Framework) Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+ License: LGPL-3.0-or-later AND MPL-2.0+
@ -148,7 +148,6 @@ BuildRequires: libtool
BuildRequires: lpsolve-devel BuildRequires: lpsolve-devel
BuildRequires: make BuildRequires: make
BuildRequires: memory-constraints BuildRequires: memory-constraints
BuildRequires: neon-devel >= 0.26.0
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
BuildRequires: pentaho-libxml BuildRequires: pentaho-libxml
BuildRequires: pentaho-reporting-flow-engine BuildRequires: pentaho-reporting-flow-engine
@ -165,6 +164,7 @@ BuildRequires: xz
BuildRequires: zip BuildRequires: zip
BuildRequires: perl(Archive::Zip) BuildRequires: perl(Archive::Zip)
BuildRequires: perl(Digest::MD5) BuildRequires: perl(Digest::MD5)
BuildRequires: pkgconfig(apr-util-1)
BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(bluez)
BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(epoxy) >= 1.2 BuildRequires: pkgconfig(epoxy) >= 1.2
@ -220,6 +220,7 @@ BuildRequires: pkgconfig(poppler-cpp)
BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(redland) BuildRequires: pkgconfig(redland)
BuildRequires: pkgconfig(sane-backends) BuildRequires: pkgconfig(sane-backends)
BuildRequires: pkgconfig(serf-1) >= 1.1.0
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.24 BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.24
BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xt)
@ -1027,7 +1028,6 @@ export NOCONFIGURE=yes
--with-external-tar="$RPM_SOURCE_DIR" \ --with-external-tar="$RPM_SOURCE_DIR" \
--disable-epm \ --disable-epm \
--disable-online-update \ --disable-online-update \
--disable-systray \
--disable-gstreamer-0-10 \ --disable-gstreamer-0-10 \
--enable-gstreamer-1-0 \ --enable-gstreamer-1-0 \
%if %{with gtk3} %if %{with gtk3}
@ -1052,6 +1052,7 @@ export NOCONFIGURE=yes
--without-fonts \ --without-fonts \
--without-myspell-dicts \ --without-myspell-dicts \
--with-jdk-home=$JAVA_HOME \ --with-jdk-home=$JAVA_HOME \
--with-webdav=serf \
--with-beanshell-jar=%{_datadir}/java/bsh2/bsh.jar \ --with-beanshell-jar=%{_datadir}/java/bsh2/bsh.jar \
--with-ant-home=%{_datadir}/ant \ --with-ant-home=%{_datadir}/ant \
--with-external-dict-dir=%{_datadir}/hunspell \ --with-external-dict-dir=%{_datadir}/hunspell \
@ -1083,7 +1084,6 @@ export NOCONFIGURE=yes
--enable-scripting-beanshell \ --enable-scripting-beanshell \
--enable-scripting-javascript \ --enable-scripting-javascript \
--disable-vlc \ --disable-vlc \
--enable-neon \
--disable-ccache \ --disable-ccache \
--disable-coinmp \ --disable-coinmp \
--enable-symbols \ --enable-symbols \