From 7fa18cd65861ef8c692749b652765f62fd6d9c29cc0f394a05faf373642a1d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 5 Feb 2014 08:44:20 +0000 Subject: [PATCH] Accepting request 220892 from home:fcrozat:branches:LibreOffice:Factory - Change how to enable/disable VLC support, allowing to override this with OBS prjconf (needed for SLE). OBS-URL: https://build.opensuse.org/request/show/220892 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=109 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index a8ca10d..85e92a1 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 3 14:52:10 UTC 2014 - fcrozat@suse.com + +- Change how to enable/disable VLC support, allowing to override + this with OBS prjconf (needed for SLE). + ------------------------------------------------------------------- Sun Feb 2 14:42:45 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 318a106..4e333db 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -16,6 +16,13 @@ # +# vlc is only on 13.1 and later and not for SLE +%if 0%{?suse_version} > 1310 +%define with_vlc 1 +%else +%define with_vlc 0 +%endif + # List of supported langs, populated bellow in the lang macros %global langpack_langs %{nil} # extensions @@ -231,9 +238,7 @@ Provides: %{name}-l10n-prebuild = %{version} Obsoletes: %{name}-l10n-prebuild < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64 -# vlc is only on 13.1 and later -# Drop this condition when 12.3 is out of support -%if 0%{?suse_version} > 01230 +%if 0%{?with_vlc} BuildRequires: vlc-devel %endif # we need a JRE for oobase and the other stuff @@ -958,7 +963,7 @@ export NOCONFIGURE=yes --enable-scripting-javascript \ --enable-telepathy \ --enable-opengl \ -%if 0%{?suse_version} > 01230 +%if 0%{?with_vlc} --enable-vlc \ %endif --enable-neon \