Author: rdieter Update of /cvs/free/rpms/phonon-backend-vlc/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv2012 Modified Files: .cvsignore phonon-backend-vlc.spec sources Log Message: sync w/devel branch for 0.5.0 goodness (and phonon-4.6.x compatibility) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/phonon-backend-vlc/F-16/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Dec 2011 15:09:46 -0000 1.8 +++ .cvsignore 7 Jan 2012 14:55:25 -0000 1.9 @@ -1 +1 @@ -phonon-backend-vlc-0.4.1.tar.xz +phonon-backend-vlc-0.5.0-20120107.tar.xz Index: phonon-backend-vlc.spec =================================================================== RCS file: /cvs/free/rpms/phonon-backend-vlc/F-16/phonon-backend-vlc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- phonon-backend-vlc.spec 12 Dec 2011 15:09:47 -0000 1.11 +++ phonon-backend-vlc.spec 7 Jan 2012 14:55:25 -0000 1.12 @@ -1,15 +1,17 @@ +%define snap 20120107 + name: phonon-backend-vlc Summary: VLC phonon backend -Version: 0.4.1 -Release: 2%{?dist} +Version: 0.5.0 +Release: 0.2.%{snap}git%{?dist} Group: Applications/Multimedia License: LGPLv2+ URL: http://phonon.kde.org/ %if 0%{?snap} -# git clone git://gitorious.org/phonon/phonon-vlc.git -# git archive --prefix=phonon-backend-vlc-%{version}/ master | xz > phonon-vlc-%{version}-%{snap}.tar.xz -Source0: phonon-vlc-%{version}-%{snap}.tar.xz +# git clone git://anongit.kde.org/phonon-vlc; cd phonon-vlc +# git archive --prefix=phonon-backend-vlc-%{version}/ master | xz > phonon-backend-vlc-%{version}-%{snap}.tar.xz +Source0: phonon-backend-vlc-%{version}-%{snap}.tar.xz %else Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-vlc/%{version}/pho... %endif @@ -17,21 +19,23 @@ BuildRequires: automoc4 >= 0.9.86 BuildRequires: cmake >= 2.6.0 -BuildRequires: phonon-devel >= 4.5.0 BuildRequires: kde-filesystem -BuildRequires: libxcb-devel -BuildRequires: libxml2-devel -BuildRequires: qt4-devel -BuildRequires: vlc-devel >= 1.1.1 +BuildRequires: pkgconfig(libvlc) >= 1.1.10 +BuildRequires: pkgconfig(libxml-2.0) +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.5.0) -%global vlc_ver %(pkg-config --modversion libvlc 2>/dev/null || echo 1.1.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: phonon%{?_isa} >= %{phonon_ver} -Requires: qt4%{?_isa} >= %{_qt4_version} +%{?_qt4:Requires: qt4%{?_isa} >= %{_qt4_version}} %description @@ -72,6 +76,16 @@ %changelog +* Sat Jan 07 2012 Rex Dieter <rdieter(a)fedoraproject.org&gt; 0.5.0-0.2.20120107git +- 20120107 (master branch) snapshot + +* Mon Dec 12 2011 Rex Dieter <rdieter(a)fedoraproject.org&gt; 0.5.0-0.1.20111212git +- 20111212 (master branch) snapshot + +* Fri Oct 21 2011 Rex Dieter <rdieter(a)fedoraproject.org&gt; 0.4.55-0.1.20111021 +- 20111021 snapshot +- pkgconfig-style deps + * Mon Aug 15 2011 Rex Dieter <rdieter(a)fedoraproject.org&gt; 0.4.1-2 - rebuild Index: sources =================================================================== RCS file: /cvs/free/rpms/phonon-backend-vlc/F-16/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Dec 2011 15:09:47 -0000 1.8 +++ sources 7 Jan 2012 14:55:25 -0000 1.9 @@ -1 +1 @@ -3adc566c8b24fb2374697b8b14309d26 phonon-backend-vlc-0.4.1.tar.xz +934ae25d70fec75459d41d7a04e895ee phonon-backend-vlc-0.5.0-20120107.tar.xz