SHA256
1
0
forked from pool/libreoffice

- Switch to serf from neon package that is quite dead

- Remove sysstray configure option as the code was removed

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=710
This commit is contained in:
Tomáš Chvátal 2018-09-18 08:27:43 +00:00 committed by Git OBS Bridge
parent f80f4170b2
commit b91c16697a
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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> Mon Sep 17 09:30:11 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -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 \