Author: arekm Date: Thu Mar 12 08:11:43 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 7; build with phonon but don't package it (in effect - use phonon from phonon.spec instead)
---- Files affected: SPECS: qt4.spec (1.202 -> 1.203) ---- Diffs: ================================================================ Index: SPECS/qt4.spec diff -u SPECS/qt4.spec:1.202 SPECS/qt4.spec:1.203 --- SPECS/qt4.spec:1.202 Thu Mar 12 07:19:06 2009 +++ SPECS/qt4.spec Thu Mar 12 09:11:37 2009 @@ -43,6 +43,7 @@ %bcond_without ibase # don't build ibase (InterBase/Firebird) plugin %bcond_without pch # disable pch in qmake %bcond_without gtk # don't build GTK theme integration +%bcond_without system_phonon %bcond_with sse # use SSE instructions in gui/painting module %bcond_with sse2 # use SSE2 instructions # @@ -65,7 +66,7 @@ Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt Name: qt4 Version: 4.5.0 -Release: 6 +Release: 7 License: LGPL v2.1 or GPL v3.0 Group: X11/Libraries Source0: http://download.qtsoftware.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz @@ -1020,7 +1021,11 @@ Requires: QtGui-devel = %{version}-%{release} Requires: QtNetwork-devel = %{version}-%{release} Requires: QtWebKit = %{version}-%{release} +%if %{with system_phonon} +Requires: phonon-devel +%else Requires: qt4-phonon-devel = %{version}-%{release} +%endif %description -n QtWebKit-devel Classes for rendering HTML, XHTML and SVG documents - development @@ -1984,12 +1989,14 @@ %{_desktopdir}/linguist-qt4.desktop %{_pixmapsdir}/linguist-qt4.png +%if ! %{with system_phonon} %files phonon %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libphonon.so.*.* %attr(755,root,root) %ghost %{_libdir}/libphonon.so.4 %dir %{_qtdir}/plugins/phonon_backend %attr(755,root,root) %{_qtdir}/plugins/phonon_backend/libphonon_gstreamer.so +%endif %files qmake %defattr(644,root,root,755) @@ -2080,8 +2087,10 @@ %files -n QtXmlPatterns-devel -f QtXmlPatterns-devel.files %defattr(644,root,root,755) +%if ! %{with system_phonon} %files phonon-devel -f phonon-devel.files %defattr(644,root,root,755) +%endif %if %{with static_libs} %files -n Qt3Support-static @@ -2174,6 +2183,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.203 2009/03/12 08:11:37 arekm +- rel 7; build with phonon but don't package it (in effect - use phonon from phonon.spec instead) + Revision 1.202 2009/03/12 06:19:06 arekm - rel 6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt4.spec?r1=1.202&r2=1.203&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
