Accepting request 234661 from home:olh:branches:multimedia:libs

- Include also libglobalhotkeys_plugin.so which is build with old x11

- BuildRequire at least gnutls 3.0.20

OBS-URL: https://build.opensuse.org/request/show/234661
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=76

vlc.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu May 15 11:47:43 CEST 2014 - ohering@suse.de
+
+- Include also libglobalhotkeys_plugin.so which is build with old x11
+
+-------------------------------------------------------------------
+Thu May 15 11:30:28 CEST 2014 - ohering@suse.de
+
+- BuildRequire at least gnutls 3.0.20
+
 -------------------------------------------------------------------
 Fri May  2 08:29:17 CEST 2014 - ohering@suse.de
 

vlc.spec

@@ -54,7 +54,9 @@ BuildRequires:  gdk-pixbuf-devel
 BuildRequires:  gettext-devel
 BuildRequires:  git
 BuildRequires:  gnome-vfs2-devel
-BuildRequires:  gnutls-devel
+%if 0%{?suse_version} >= 1220
+BuildRequires:  gnutls-devel >= 3.0.20
+%endif
 BuildRequires:  gtk2-devel
 BuildRequires:  libSDL-devel
 BuildRequires:  libSDL_image-devel
@@ -283,7 +285,9 @@ export CXXFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient"
    --enable-glx                         \
    --enable-gme                         \
    --enable-gnomevfs                    \
+%if 0%{?suse_version} >= 1220
    --enable-gnutls                      \
+%endif
    --enable-httpd                       \
    --enable-jack                        \
    --enable-kate                        \
@@ -641,6 +645,9 @@ done
 %{_libdir}/vlc/plugins/control/libdummy_plugin.so
 %{_libdir}/vlc/plugins/control/libgestures_plugin.so
 %{_libdir}/vlc/plugins/control/libhotkeys_plugin.so
+%if 0%{?suse_version} < 1220
+%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
+%endif
 %{_libdir}/vlc/plugins/control/liblirc_plugin.so
 %{_libdir}/vlc/plugins/control/libmotion_plugin.so
 %{_libdir}/vlc/plugins/control/libnetsync_plugin.so
@@ -691,7 +698,9 @@ done
 %{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so
 %{_libdir}/vlc/plugins/misc/libdbus_screensaver_plugin.so
 %{_libdir}/vlc/plugins/misc/libexport_plugin.so
+%if 0%{?suse_version} >= 1220
 %{_libdir}/vlc/plugins/misc/libgnutls_plugin.so
+%endif
 %{_libdir}/vlc/plugins/misc/liblogger_plugin.so
 %{_libdir}/vlc/plugins/misc/libstats_plugin.so
 %{_libdir}/vlc/plugins/misc/libvod_rtsp_plugin.so