From ae97e1f4b56d80fceb85b5ffa7b648600ec1237daf3ca57d4dde4eac25575450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 7 Mar 2016 20:49:53 +0000 Subject: [PATCH] - Use mdds-1.0 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=382 --- libreoffice.changes | 5 +++++ libreoffice.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 36f8299..0ebaab9 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 7 20:49:35 UTC 2016 - tchvatal@suse.com + +- Use mdds-1.0 + ------------------------------------------------------------------- Thu Mar 3 08:47:48 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 8a5a47f..7c34c10 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -318,7 +318,6 @@ BuildRequires: libwps-devel >= 0.4.2 BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: lpsolve-devel -BuildRequires: mdds-devel >= 0.12.0 BuildRequires: npapi-sdk BuildRequires: openCOLLADA-devel BuildRequires: pentaho-libxml @@ -332,6 +331,7 @@ BuildRequires: ucpp BuildRequires: vigra-devel BuildRequires: xml-commons-apis BuildRequires: pkgconfig(fbembed) +BuildRequires: pkgconfig(mdds-1.0) %else BuildRequires: chrpath %endif @@ -1117,6 +1117,13 @@ export PYTHON_CFLAGS=`%{python_type}-config --cflags` export PYTHON_LIBS=`%{python_type}-config --libs` %endif +%if %{with systemlibs} +# FIXME: Adjust with next mdds switch, configure.ac still checks just mdds +# without suffix number +export MDDS_CFLAGS=`pkg-config --cflags mdds-1.0` +export MDDS_LIBS=' ' +%endif + # Old systems need help in finding the gcc %if !%{with newmedia} export CC=%{_bindir}/gcc-4.8