packages: phonon/phonon.spec - don't build QtDesigner plugin if not packagi...

[qboosh]

Author: qboosh                       Date: Wed Dec 28 08:17:18 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't build QtDesigner plugin if not packaging it here (already built in qt)
- now libqzeitgeist 0.8 is required
- gstreamer and xine no longer used here
- package cmake files

---- Files affected:
packages/phonon:
   phonon.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: packages/phonon/phonon.spec
diff -u packages/phonon/phonon.spec:1.58 packages/phonon/phonon.spec:1.59
--- packages/phonon/phonon.spec:1.58	Sat Dec 24 13:54:43 2011
+++ packages/phonon/phonon.spec	Wed Dec 28 09:17:13 2011
@@ -20,15 +20,15 @@
 BuildRequires:	QtTest-devel >= %{qtver}
 BuildRequires:	automoc4 >= 0.9.86
 BuildRequires:	cmake >= 2.8.0
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires:	libqzeitgeist-devel
+BuildRequires:	glib2-devel >= 2.0
+BuildRequires:	libqzeitgeist-devel >= 0.8
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel >= 0.9.21
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.603
-BuildRequires:	xine-lib-devel >= 2:1.1.15-4
 Requires:	kde-common-dirs >= 0.5
+Requires:	libqzeitgeist >= 0.8
 Suggests:	qt4-phonon-backend
 Provides:	qt4-phonon
 Obsoletes:	qt4-phonon
@@ -77,7 +77,9 @@
 %build
 install -d build
 cd build
-%cmake ..
+# disable designer plugin - currently packaged in QtDesigner package
+%cmake .. \
+	-DPHONON_BUILD_DESIGNER_PLUGIN=OFF
 
 %{__make}
 
@@ -93,9 +95,6 @@
 ln -s ../phonon $RPM_BUILD_ROOT%{_includedir}/qt4/phonon
 ln -s ../KDE/Phonon $RPM_BUILD_ROOT%{_includedir}/phonon/Phonon
 
-# currently packaged in QtDesigner
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/designer/libphononwidgets.so
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,6 +120,7 @@
 %{_includedir}/KDE/Phonon
 %{_includedir}/qt4/phonon
 %{_pkgconfigdir}/phonon.pc
+%{_libdir}/cmake/phonon
 %dir %{_datadir}/phonon
 %{_datadir}/phonon/buildsystem
 %{_datadir}/qt4/mkspecs/modules/qt_phonon.pri
@@ -131,6 +131,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2011/12/28 08:17:13  qboosh
+- don't build QtDesigner plugin if not packaging it here (already built in qt)
+- now libqzeitgeist 0.8 is required
+- gstreamer and xine no longer used here
+- package cmake files
+
 Revision 1.58  2011/12/24 12:54:43  lisu
 - package missing dir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phonon/phonon.spec?r1=1.58&r2=1.59&f=u