From 1df29bb7cd923243c0e6a913bb43030e47dde11ff0f22119b41424dc9db0bd83 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 16 Mar 2016 10:37:54 +0000 Subject: [PATCH 1/3] Drop gnome-vfs2 dependency OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=159 --- vlc.changes | 8 ++++++++ vlc.spec | 18 +----------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/vlc.changes b/vlc.changes index e2a0069..ad84b59 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 16 10:32:14 UTC 2016 - dimstar@opensuse.org + +- Disable deprecated gnome-vfs2 support (that was GNOME 2 tech): + + Remove --enable-gnomevfs configure parameter. + + Remove gnome-vfs2-devel BuildRequires. + + Drop -gnome subpackage and obsolete it by the main package. + ------------------------------------------------------------------- Fri Feb 5 21:28:01 UTC 2016 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 9d49a3c..88340f2 100644 --- a/vlc.spec +++ b/vlc.spec @@ -62,7 +62,6 @@ BuildRequires: freetype2 BuildRequires: fribidi-devel BuildRequires: gettext-devel BuildRequires: git -BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel BuildRequires: libavc1394-devel >= 0.5.3 BuildRequires: libcddb-devel >= 0.9.5 @@ -208,6 +207,7 @@ BuildRequires: pkgconfig(x264) >= 0.8.6 BuildRequires: pkgconfig(vdpau) >= 0.6 %endif %endif +Obsoletes: %{name}-gnome <= %{version} %description VLC media player is a highly portable multimedia player for various @@ -288,17 +288,6 @@ Conflicts: %{conflicts}-qt %description qt The all new Qt interface for the VLC VideoLAN Client. -%package gnome -Summary: VLC: VideoLAN Client - Gnome Access Modules -Group: Productivity/Multimedia/Video/Players -Requires: %{name}-noX = %{version}-%{release} -Supplements: packageand(%{name}-noX:gnome-vfs2) -Conflicts: %{conflicts}-gnome - -%description gnome -In order to integrate flawless into GNOME, there are some access modules -for gnome-vfs2. - %prep echo '********* ENTERED PREP PHASE ********' date @@ -368,7 +357,6 @@ export CXXFLAGS="%{optflags}" %endif --enable-freetype \ --enable-fribidi \ - --enable-gnomevfs \ %if 0%{?suse_version} > 1140 --enable-gnutls \ %endif @@ -1148,10 +1136,6 @@ done %{_mandir}/man1/qvlc* %{_libdir}/vlc/plugins/gui/libqt4_plugin.so -%files gnome -%defattr(-,root,root) -%{_libdir}/vlc/plugins/access/libgnomevfs_plugin.so - %files devel %defattr(-,root,root) %{_includedir}/vlc/ From 706009d412d6f58ff90f5b804329f4ebb8a5dff1fd23c0c5c90c81e1f67d1190 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 16 Mar 2016 11:01:41 +0000 Subject: [PATCH 2/3] fixup OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=160 --- vlc.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/vlc.spec b/vlc.spec index 88340f2..e215f18 100644 --- a/vlc.spec +++ b/vlc.spec @@ -512,9 +512,6 @@ done %post -n %{name}-qt %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins -%post -n %{name}-gnome -%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins - %if 0%{?BUILD_ORIG} %post -n %{name}-codecs %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins From 756c589d733c57ece226f436fe553b2fb12709be3b17264d7855a35a64e71190 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 16 Mar 2016 12:43:37 +0000 Subject: [PATCH 3/3] fixup OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=161 --- vlc.changes | 5 +++-- vlc.spec | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/vlc.changes b/vlc.changes index ad84b59..b8d4359 100644 --- a/vlc.changes +++ b/vlc.changes @@ -2,9 +2,10 @@ Wed Mar 16 10:32:14 UTC 2016 - dimstar@opensuse.org - Disable deprecated gnome-vfs2 support (that was GNOME 2 tech): - + Remove --enable-gnomevfs configure parameter. + + Replace --enable-gnomevfs configure parameter with + --disable-gnomevfs. + Remove gnome-vfs2-devel BuildRequires. - + Drop -gnome subpackage and obsolete it by the main package. + + Drop -gnome subpackage and obsolete it by the main package. ------------------------------------------------------------------- Fri Feb 5 21:28:01 UTC 2016 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index e215f18..43ccd6d 100644 --- a/vlc.spec +++ b/vlc.spec @@ -357,6 +357,7 @@ export CXXFLAGS="%{optflags}" %endif --enable-freetype \ --enable-fribidi \ + --disable-gnomevfs \ %if 0%{?suse_version} > 1140 --enable-gnutls \ %endif