From 6a2c478195741fb6fe8d98902cedc234232dd699f5573101d3ccc43349925416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 1 Sep 2016 07:43:08 +0000 Subject: [PATCH] Accepting request 424095 from home:wolfi323:branches:LibreOffice:Factory - 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 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 0a6dd64..a268620 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -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 diff --git a/libreoffice.spec b/libreoffice.spec index d4d026f..d465ef8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -119,7 +119,11 @@ BuildRequires: libtool BuildRequires: lpsolve-devel BuildRequires: make BuildRequires: neon-devel >= 0.26.0 +%if %{suse_version} == 1315 BuildRequires: openCOLLADA-devel +%else +BuildRequires: libopenCOLLADA-devel +%endif BuildRequires: openldap2-devel BuildRequires: pentaho-libxml BuildRequires: pentaho-reporting-flow-engine