Accepting request 373773 from multimedia:libs

Disable gnome-vfs2 integration - it is old, unmaintained and vlc 3.0 also drops it

OBS-URL: https://build.opensuse.org/request/show/373773
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=52
This commit is contained in:
Dominique Leuenberger 2016-03-18 20:41:52 +00:00 committed by Git OBS Bridge
commit c3b0f652b5
2 changed files with 11 additions and 20 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Mar 16 10:32:14 UTC 2016 - dimstar@opensuse.org
- Disable deprecated gnome-vfs2 support (that was GNOME 2 tech):
+ Replace --enable-gnomevfs configure parameter with
--disable-gnomevfs.
+ 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 Fri Feb 5 21:28:01 UTC 2016 - dimstar@opensuse.org

View File

@ -62,7 +62,6 @@ BuildRequires: freetype2
BuildRequires: fribidi-devel BuildRequires: fribidi-devel
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: git BuildRequires: git
BuildRequires: gnome-vfs2-devel
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: libavc1394-devel >= 0.5.3 BuildRequires: libavc1394-devel >= 0.5.3
BuildRequires: libcddb-devel >= 0.9.5 BuildRequires: libcddb-devel >= 0.9.5
@ -208,6 +207,7 @@ BuildRequires: pkgconfig(x264) >= 0.8.6
BuildRequires: pkgconfig(vdpau) >= 0.6 BuildRequires: pkgconfig(vdpau) >= 0.6
%endif %endif
%endif %endif
Obsoletes: %{name}-gnome <= %{version}
%description %description
VLC media player is a highly portable multimedia player for various VLC media player is a highly portable multimedia player for various
@ -288,17 +288,6 @@ Conflicts: %{conflicts}-qt
%description qt %description qt
The all new Qt interface for the VLC VideoLAN Client. 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 %prep
echo '********* ENTERED PREP PHASE ********' echo '********* ENTERED PREP PHASE ********'
date date
@ -368,7 +357,7 @@ export CXXFLAGS="%{optflags}"
%endif %endif
--enable-freetype \ --enable-freetype \
--enable-fribidi \ --enable-fribidi \
--enable-gnomevfs \ --disable-gnomevfs \
%if 0%{?suse_version} > 1140 %if 0%{?suse_version} > 1140
--enable-gnutls \ --enable-gnutls \
%endif %endif
@ -524,9 +513,6 @@ done
%post -n %{name}-qt %post -n %{name}-qt
%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins %{_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} %if 0%{?BUILD_ORIG}
%post -n %{name}-codecs %post -n %{name}-codecs
%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins
@ -1148,10 +1134,6 @@ done
%{_mandir}/man1/qvlc* %{_mandir}/man1/qvlc*
%{_libdir}/vlc/plugins/gui/libqt4_plugin.so %{_libdir}/vlc/plugins/gui/libqt4_plugin.so
%files gnome
%defattr(-,root,root)
%{_libdir}/vlc/plugins/access/libgnomevfs_plugin.so
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/vlc/ %{_includedir}/vlc/