packages: qt4/qt4.spec - rm files without system phonon - fix duplicate pac...

[glen]

Author: glen                         Date: Sat Aug 29 16:23:51 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rm files without system phonon
- fix duplicate packaging of %{_libdir}/qt4

---- Files affected:
packages/qt4:
   qt4.spec (1.221 -> 1.222) 

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.221 packages/qt4/qt4.spec:1.222
--- packages/qt4/qt4.spec:1.221	Fri Aug 14 10:38:34 2009
+++ packages/qt4/qt4.spec	Sat Aug 29 18:23:46 2009
@@ -1472,7 +1472,7 @@
 	-%{!?with_sqlite3:no}%{?with_sqlite3:plugin}-sql-sqlite \
 	-%{!?with_sqlite:no}%{?with_sqlite:plugin}-sql-sqlite2 \
 	-%{!?with_ibase:no}%{?with_ibase:plugin}-sql-ibase \
-	-shared" 
+	-shared"
 
 echo "o
 yes" | ./configure $COMMONOPT $OPT
@@ -1678,9 +1678,17 @@
 	ifecho demos %{_examplesdir}/qt4-demos/$f
 done
 
+%if %{with system_phonon}
+for a in $(sed -e '/%defattr/d;s/\(%dir\|%attr[^ ]\+\) //;' < phonon-devel.files); do
+	rm -rf $RPM_BUILD_ROOT$a
+done
+rm -f $RPM_BUILD_ROOT%{_libdir}/libphonon.so.*
+rm -f $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/phonon_backend/libphonon_gstreamer.so
+%endif
+
 # check whether no other fixes are needed
 mv $RPM_BUILD_ROOT%{_datadir}/locale/ja_JP/LC_MESSAGES/*.* \
-        $RPM_BUILD_ROOT%{_datadir}/locale/ja/LC_MESSAGES/
+	$RPM_BUILD_ROOT%{_datadir}/locale/ja/LC_MESSAGES/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1777,9 +1785,8 @@
 %dir %{_qtdir}/plugins/network
 %dir %{_qtdir}/plugins/sqldrivers
 %dir %{_qtdir}/plugins/script
+%dir %{_qtdir}/tools
 %dir %{_datadir}/qt4
-%dir %{_libdir}/qt4
-%dir %{_libdir}/qt4/tools
 %lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/qt4.qm
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4.qm
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/qt4.qm
@@ -2192,6 +2199,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.222  2009/08/29 16:23:46  glen
+- rm files without system phonon
+- fix duplicate packaging of %{_libdir}/qt4
+
 Revision 1.221  2009/08/14 08:38:34  uzsolt
 - QtDesigner requires QtScript
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.221&r2=1.222&f=u