pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Use mdds-1.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=382
This commit is contained in:
Tomáš Chvátal 2016-03-07 20:49:53 +00:00 committed by Git OBS Bridge
parent a402bdd0f8
commit ae97e1f4b5
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libreoffice.changes
View File

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

9
libreoffice.spec
View File

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