diff --git a/libreoffice.changes b/libreoffice.changes index 85e92a1..986bed6 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 6 14:23:31 UTC 2014 - fcrozat@suse.com + +- Fix vlc macro in specfile. + ------------------------------------------------------------------- Mon Feb 3 14:52:10 UTC 2014 - fcrozat@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 4e333db..a8b5c86 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -17,10 +17,10 @@ # vlc is only on 13.1 and later and not for SLE -%if 0%{?suse_version} > 1310 -%define with_vlc 1 +%if 0%{?suse_version} < 1310 +%bcond_with vlc %else -%define with_vlc 0 +%bcond_without vlc %endif # List of supported langs, populated bellow in the lang macros @@ -238,7 +238,7 @@ Provides: %{name}-l10n-prebuild = %{version} Obsoletes: %{name}-l10n-prebuild < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64 -%if 0%{?with_vlc} +%if %{with_vlc} BuildRequires: vlc-devel %endif # we need a JRE for oobase and the other stuff @@ -963,7 +963,7 @@ export NOCONFIGURE=yes --enable-scripting-javascript \ --enable-telepathy \ --enable-opengl \ -%if 0%{?with_vlc} +%if %{with_vlc} --enable-vlc \ %endif --enable-neon \