rpms/qt/devel Global,NONE,1.1 qt.spec,1.285,1.286

[Rex Dieter]

Author: rdieter

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

Modified Files:
	qt.spec 
Added Files:
	Global 
Log Message:
* Sat Jun 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-16
- install awol Phonon/Global header



--- NEW FILE Global ---
#include "phononnamespace.h"


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- qt.spec	5 Jun 2009 23:59:02 -0000	1.285
+++ qt.spec	6 Jun 2009 19:39:11 -0000	1.286
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -33,6 +33,9 @@ Source4: Trolltech.conf
 %define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
 Source5: qconfig-multilib.h
 
+# Hack around missing Phonon/Global header
+Source6: Global
+
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
 Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
@@ -624,11 +627,15 @@ mkdir %{buildroot}%{_qt4_plugindir}/styl
 
 %if 0%{?phonon:1} 
 mkdir -p %{buildroot}%{_qt4_plugindir}/phonon_backend
-pushd %{buildroot}%{_includedir}
+pushd %{buildroot}%{_qt4_headerdir}
 ln -s phonon Phonon
 popd
-mkdir -p %{buildroot}%{_datadir}/kde4/services/phononbackends
-install -m644 %{SOURCE25} %{buildroot}%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
+if [ -f %{buildroot}%{_qt4_headerdir}/Phonon/Global ]; then
+echo "WARNING: Phonon/Global exists, can remove specfile hack"
+else
+install -p -m644 %{SOURCE6} %{buildroot}%{_qt4_headerdir}/Phonon/Global
+fi
+install -p -m644 -D %{SOURCE25} %{buildroot}%{_datadir}/kde4/services/phononbackends/gstreamer.desktop
 %endif
 
 
@@ -848,6 +855,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Sat Jun 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-16
+- install awol Phonon/Global header
+
 * Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.1-15
 - apply Phonon PulseAudio patch (needed for the xine-lib backend)