From 9a385aa632bc46903b7f2eae2ff526f272908a1b4952cb5960ceb0eec0fa7ab3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 14 May 2015 07:39:13 +0000 Subject: [PATCH] Accepting request 307099 from home:alois:branches:multimedia:libs Switched to Qt5. According to upstream developers it's the preferable one. OBS-URL: https://build.opensuse.org/request/show/307099 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=131 --- vlc.changes | 5 +++++ vlc.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/vlc.changes b/vlc.changes index b6a364f..0fa3f77 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 13 15:46:45 UTC 2015 - aloisio@gmx.com + +- Enabled Qt5 for targets that support it. + ------------------------------------------------------------------- Fri May 1 18:22:44 UTC 2015 - jengelh@inai.de diff --git a/vlc.spec b/vlc.spec index 58413f2..a57e63c 100644 --- a/vlc.spec +++ b/vlc.spec @@ -75,14 +75,17 @@ BuildRequires: libmodplug-devel >= 0.8.4 BuildRequires: libnotify-devel BuildRequires: libogg-devel >= 1.0 BuildRequires: libopus-devel >= 1.0.3 -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1310 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) +%if 0%{?suse_version} != 1315 BuildRequires: pkgconfig(Qt5X11Extras) +%endif %else BuildRequires: libqt4-devel >= 4.6.0 %endif +BuildRequires: libjpeg-devel BuildRequires: libraw1394 >= 2.0.1 BuildRequires: librsvg-devel >= 2.9.0 BuildRequires: libsamplerate-devel @@ -270,7 +273,11 @@ Codecs that are not available in a stock openSUSE distribution. Summary: VLC: VideoLAN Client - Qt interface Group: Productivity/Multimedia/Video/Players Requires: %{name}-noX = %{version}-%{release} +%if 0%{?suse_version} >= 1310 +Supplements: packageand(%{name}-noX:libqt5) +%else Supplements: packageand(%{name}-noX:libqt4) +%endif Conflicts: %{conflicts}-qt %description qt