rpms/qt/devel gstreamer.desktop,NONE,1.1 qt.spec,1.283,1.284

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24982

Modified Files:
	qt.spec 
Added Files:
	gstreamer.desktop 
Log Message:
enable phonon and gstreamer-backend




--- NEW FILE gstreamer.desktop ---
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=PhononBackend
MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg;
X-KDE-Library=libphonon_gstreamer
X-KDE-PhononBackendInfo-InterfaceVersion=1
X-KDE-PhononBackendInfo-Version=0.1
X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/
Icon=phonon-gstreamer
InitialPreference=10

Name=GStreamer
Name[pa]=ਜੀਸਟੀਰਮਰ
Name[sr]=Гстример
Name[sv]=Gstreamer
Name[x-test]=xxGStreamerxx

Comment=Phonon GStreamer backend
Comment[bg]=Phonon GStreamer
Comment[ca]=Dorsal GStreamer del Phonon
Comment[da]=GStreamer-backend til Phonon
Comment[de]=Phonon-Treiber für GStreamer
Comment[el]=Σύστημα υποστήριξης GStreamer του Phonon
Comment[es]=Motor GStreamer para Phonon
Comment[et]=Phononi GStreameri taustaprogramm
Comment[fr]=Système de gestion GStreamer pour Phonon 
Comment[ga]=Inneall GStreamer le haghaidh Phonon
Comment[gl]=Infraestrutura de GStreamer para Phonon
Comment[is]=Phonon GStreamer bakendi
Comment[it]=Motore Gstreamer di Phonon
Comment[ja]=Phonon GStreamer バックエンド
Comment[ko]=Phonon GStreamer 백엔드
Comment[ku]=Binesaza Phonon GStreamer
Comment[lv]=Phonon GStreamer aizmugure
Comment[nds]=Phonon-Hülpprogramm GStreamer
Comment[nl]=GStreamer-backend (Phonon)
Comment[nn]=Phonon-motor for GStreamer
Comment[pa]=ਫੋਨੋਨ ਜਸਟੀਰਮਰ ਬੈਕਐਂਡ
Comment[pl]=Obsługa GStreamera przez Phonon
Comment[pt]=Infra-estrutura do GStreamer para o Phonon
Comment[pt_BR]=Infraestrutura Phonon GStreamer
Comment[sk]=GStreamer podsystém
Comment[sl]=Phononova hrbtenica GStreamer
Comment[sr]=Гстример као позадина Фонона
Comment[sr at latin]=GStreamer kao pozadina Phonona
Comment[sv]=Phonon Gstreamer-gränssnitt
Comment[tr]=Phonon GStreamer arka ucu
Comment[uk]=Сервер GStreamer для Phonon
Comment[x-test]=xxPhonon GStreamer backendxx
Comment[zh_CN]=Phonon GStreamer 后端
Comment[zh_TW]=Phonon GStreamer 後端介面


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- qt.spec	30 May 2009 17:39:44 -0000	1.283
+++ qt.spec	5 Jun 2009 23:12:50 -0000	1.284
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -69,6 +69,7 @@ Source21: designer.desktop
 Source22: linguist.desktop
 Source23: qtdemo.desktop
 Source24: qtconfig.desktop
+Source25: gstreamer.desktop
 
 # upstream qt4-logo, http://trolltech.com/images/products/qt/qt4-logo
 Source30: hi128-app-qt4-logo.png
@@ -84,9 +85,7 @@ Source31: hi48-app-qt4-logo.png
 %define psql -plugin-sql-psql
 %define sqlite -plugin-sql-sqlite
 %define phonon -phonon
-# if building with --phonon, define to internal version (ie, Obsolete external phonon)
-#define phonon_internal 1
-%define phonon_backend -no-phonon-backend
+%define phonon_backend -phonon-backend
 %define phonon_version 4.3.1
 %define webkit -webkit
 %define gtkstyle -gtkstyle
@@ -232,11 +231,8 @@ Requires: libjpeg-devel
 Requires: pkgconfig
 %if 0%{?phonon:1}
 Provides: qt4-phonon-devel = %{version}-%{release}
-%endif
-%if 0%{?phonon_internal}
 Obsoletes: phonon-devel < 4.3.1-100
 Provides:  phonon-devel = 4.3.1-100
-Requires:  phonon-backend%{?_isa} >= %{phonon_version}
 %endif
 %if 0%{?webkit:1}
 Obsoletes: WebKit-qt-devel < 1.0.0-1
@@ -317,12 +313,13 @@ Provides:  qt4-postgresql = %{version}-%
 %package x11
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
-%if 0%{?phonon_internal}
+%if 0%{?phonon:1}
 Obsoletes: phonon < 4.3.1-100
+Obsoletes: phonon-backend-gstreamer < 4.3.1-100
 Provides:  phonon = 4.3.1-100
-%endif
-%if 0%{?phonon:1}
-Provides: qt4-phonon = %{version}-%{release}
+Provides:  phonon%{?_isa} = 4.3.1-100
+Provides:  phonon-backend%{?_isa} = 4.3.1-100
+Provides:  qt4-phonon = %{version}-%{release}
 %endif
 %if 0%{?webkit:1}
 Obsoletes: WebKit-qt < 1.0.0-1
@@ -620,18 +617,11 @@ mkdir %{buildroot}%{_qt4_plugindir}/styl
 
 %if 0%{?phonon:1} 
 mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
-%endif
-
-%if ! 0%{?phonon_internal}
-mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
-rm -fv  %{buildroot}%{_qt4_libdir}/libphonon.so*
-rm -rfv %{buildroot}%{_libdir}/pkgconfig/phonon.pc
-# contents slightly different between phonon-4.3.1 and qt-4.5.0
-rm -fv  %{buildroot}%{_includedir}/phonon/phononnamespace.h
-# contents dup'd but should remove just in case
-rm -fv  %{buildroot}%{_includedir}/phonon/*.h
-#rm -rfv %{buildroot}%{_qt4_headerdir}/phonon*
-#rm -rfv %{buildroot}%{_qt4_headerdir}/Qt/phonon*
+pushd %{buildroot}%{_includedir}
+ln -s phonon Phonon
+popd
+mkdir -p %{buildroot}%{_datadir}/kde4/services/phononbackends
+install -m644 %{SOURCE25} %{buildroot}%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
 %endif
 
 
@@ -768,10 +758,8 @@ gtk-update-icon-cache -q %{_datadir}/ico
 %{_qt4_datadir}/q3porting.xml
 %if 0%{?phonon:1}
 %{_qt4_libdir}/libphonon.prl
-%if 0%{?phonon_internal}
 %{_qt4_libdir}/libphonon.so
 %endif
-%endif
 %{_qt4_libdir}/libQt*.so
 %{_qt4_libdir}/libQtUiTools*.a
 %{_qt4_libdir}/libQt*.prl
@@ -823,8 +811,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 %files x11 
 %defattr(-,root,root,-)
 %{_sysconfdir}/rpm/macros.*
-%if 0%{?phonon_internal}
+%if 0%{?phonon:1}
 %{_qt4_libdir}/libphonon.so.4*
+%{_datadir}/kde4
 %endif
 %{_qt4_libdir}/libQt3Support.so.*
 %{_qt4_libdir}/libQtAssistantClient.so.*
@@ -852,6 +841,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.5.1-14
+- enable phonon and gstreamer-backend
+
 * Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-13
 - -doc: Obsoletes: qt-doc < 1:4.5.1-4 (workaround bug #502401)