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

Accepting request 424095 from home:wolfi323:branches:LibreOffice:Factory

Browse Source 
- BuildRequire libopenCOLLADA-devel (the new package name) instead of openCOLLADA-devel, except for Leap which only has the latter

Fixes build for 13.2, openCOLLADA-devel caused the (too) old one from the main repo to be used for some reason, even though libopenCOLLADA-devel does provide openCOLLADA-devel too...

OBS-URL: https://build.opensuse.org/request/show/424095
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=428
This commit is contained in:
Tomáš Chvátal 2016-09-01 07:43:08 +00:00 committed by Git OBS Bridge
parent c8dd9e9f8d
commit 6a2c478195
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libreoffice.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 31 16:34:34 UTC 2016 - wbauer@tmo.at
- BuildRequire libopenCOLLADA-devel (the new package name) instead
of openCOLLADA-devel, except for Leap which only has the latter
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 29 19:03:53 UTC 2016 - tchvatal@suse.com Mon Aug 29 19:03:53 UTC 2016 - tchvatal@suse.com

4
libreoffice.spec
View File

@ -119,7 +119,11 @@ BuildRequires: libtool
BuildRequires: lpsolve-devel BuildRequires: lpsolve-devel
BuildRequires: make BuildRequires: make
BuildRequires: neon-devel >= 0.26.0 BuildRequires: neon-devel >= 0.26.0
%if %{suse_version} == 1315
BuildRequires: openCOLLADA-devel BuildRequires: openCOLLADA-devel
%else
BuildRequires: libopenCOLLADA-devel
%endif
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
BuildRequires: pentaho-libxml BuildRequires: pentaho-libxml
BuildRequires: pentaho-reporting-flow-engine BuildRequires: pentaho-reporting-flow-engine