7:11 p.m.
commit 8d1f56623e1dc67e7ee3beb5d5ce24f024cafe60
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Wed Mar 8 12:11:20 2017 -0700
Require vlc instead of vlc-core for GUI applications to work
Use %license
Cleanup spec
phonon-backend-vlc.spec | 66 ++++++++++++++++---------------------------------
1 file changed, 21 insertions(+), 45 deletions(-)
---
diff --git a/phonon-backend-vlc.spec b/phonon-backend-vlc.spec
index 665e7f1..11e2359 100644
--- a/phonon-backend-vlc.spec
+++ b/phonon-backend-vlc.spec
@@ -1,9 +1,9 @@
name: phonon-backend-vlc
Summary: VLC phonon backend
-Version: 0.7.1
-Release: 1%{?dist}
-
+Version: 0.6.2
+Release: 2%{?dist}
+Group: Applications/Multimedia
License: LGPLv2+
URL: http://phonon.kde.org/
%if 0%{?snap}
@@ -13,88 +13,64 @@ Source0: phonon-backend-vlc-%{version}-%{snap}.tar.xz
%else
Source0:
http://download.kde.org/stable/phonon/phonon-backend-vlc/%{version}/phono...
%endif
-
-## downstream patches
-# reset initial preference below (fedora's default) gstreamer
-Patch1: phonon-backend-vlc-0.7.0-initial_preference.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automoc4 >= 0.9.86
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.0
BuildRequires: kde-filesystem
BuildRequires: pkgconfig(libvlc) >= 1.1.10
BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: pkgconfig(phonon) >= 4.7
-BuildRequires: pkgconfig(phonon4qt5) >= 4.7
-BuildRequires: pkgconfig(QtGui)
-BuildRequires: pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(phonon) >= 4.5.50
+BuildRequires: pkgconfig(QtCore) pkgconfig(QtGui)
BuildRequires: pkgconfig(xcb)
# Oh, the irony of being in the default buildroot @ rpmfusion
BuildRequires: phonon-backend-gstreamer
-%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.7.0)
+%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.5.50)
%global vlc_ver %(pkg-config --modversion libvlc 2>/dev/null || echo 1.1.10)
Provides: phonon-backend%{?_isa} = %{phonon_ver}
-Requires: vlc-core%{?_isa} >= %{vlc_ver}
+Requires: vlc%{?_isa} >= %{vlc_ver}
Requires: phonon%{?_isa} >= %{phonon_ver}
-%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%{?_qt4:Requires: qt4%{?_isa} >= %{_qt4_version}}
-%package -n phonon-qt5-backend-vlc
-Summary: Vlc phonon-qt5 backend
-Provides: phonon-qt5-backend%{?_isa} = %{phonon_version}
-%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
-%description -n phonon-qt5-backend-vlc
-%{summary}.
%description
%{summary}.
-
%prep
%setup -q -n phonon-backend-vlc-%{version}%{?pre:-%{pre}}
-%patch1 -p1 -b .initial_preference
-
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{cmake} ..
-make %{?_smp_mflags}
-popd
-mkdir -p %{_target_platform}-Qt5
-pushd %{_target_platform}-Qt5
-%{cmake} -DPHONON_BUILD_PHONON4QT5:BOOL=ON ..
-make %{?_smp_mflags}
+%{cmake} \
+ %{?_cmake_skip_rpath} \
+ ..
popd
+make %{?_smp_mflags} -C %{_target_platform}
+
%install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-Qt5
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%files
-%doc AUTHORS COPYING.LIB
+%license COPYING.LIB
+%doc AUTHORS
%{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_vlc.so
%{_kde4_datadir}/kde4/services/phononbackends/vlc.desktop
-%files -n phonon-qt5-backend-vlc
-%doc AUTHORS COPYING.LIB
-%{_qt5_plugindir}/phonon4qt5_backend/phonon_vlc.so
-
%changelog
-* Fri Dec 06 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.1-1
-- 0.7.1
-
-* Wed Nov 06 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.0-1
-- 0.7.0, Qt5 support
-
-* Wed Oct 02 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.6.2-2
-- rebuild (vlc)
+* Wed Mar 08 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.6.2-2
+- Require vlc instead of vlc-core for GUI applications to work
+- Use %%license
+- Cleanup spec
* Wed Feb 13 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.6.2-1
- 0.6.2