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

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

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
+%if 0%{?with_vlc}
-# Drop this condition when 12.3 is out of support
-%if 0%{?suse_version} > 01230
 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 \