Accepting request 221140 from home:fcrozat:branches:LibreOffice:Factory
- Fix vlc macro in specfile. OBS-URL: https://build.opensuse.org/request/show/221140 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=110
This commit is contained in:
parent
7fa18cd658
commit
3441884128
@ -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
|
Mon Feb 3 14:52:10 UTC 2014 - fcrozat@suse.com
|
||||||
|
|
||||||
|
@ -17,10 +17,10 @@
|
|||||||
|
|
||||||
|
|
||||||
# vlc is only on 13.1 and later and not for SLE
|
# vlc is only on 13.1 and later and not for SLE
|
||||||
%if 0%{?suse_version} > 1310
|
%if 0%{?suse_version} < 1310
|
||||||
%define with_vlc 1
|
%bcond_with vlc
|
||||||
%else
|
%else
|
||||||
%define with_vlc 0
|
%bcond_without vlc
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# List of supported langs, populated bellow in the lang macros
|
# List of supported langs, populated bellow in the lang macros
|
||||||
@ -238,7 +238,7 @@ Provides: %{name}-l10n-prebuild = %{version}
|
|||||||
Obsoletes: %{name}-l10n-prebuild < %{version}
|
Obsoletes: %{name}-l10n-prebuild < %{version}
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64
|
ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64
|
||||||
%if 0%{?with_vlc}
|
%if %{with_vlc}
|
||||||
BuildRequires: vlc-devel
|
BuildRequires: vlc-devel
|
||||||
%endif
|
%endif
|
||||||
# we need a JRE for oobase and the other stuff
|
# we need a JRE for oobase and the other stuff
|
||||||
@ -963,7 +963,7 @@ export NOCONFIGURE=yes
|
|||||||
--enable-scripting-javascript \
|
--enable-scripting-javascript \
|
||||||
--enable-telepathy \
|
--enable-telepathy \
|
||||||
--enable-opengl \
|
--enable-opengl \
|
||||||
%if 0%{?with_vlc}
|
%if %{with_vlc}
|
||||||
--enable-vlc \
|
--enable-vlc \
|
||||||
%endif
|
%endif
|
||||||
--enable-neon \
|
--enable-neon \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user