rpms/qt/devel qt-x11-opensource-src-4.5.0-qdoc3.patch, NONE, 1.1 qt.spec, 1.248, 1.249

[Rex Dieter]

Author: rdieter

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

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.0-qdoc3.patch 
Log Message:
* Wed Mar 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-3
- -no-phonon-backend
- include qdoc3
- move designer plugins to runtime (#487622)


qt-x11-opensource-src-4.5.0-qdoc3.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-qdoc3.patch ---
diff -up qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro
--- qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3	2009-02-25 15:09:26.000000000 -0600
+++ qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro	2009-03-04 09:30:05.000000000 -0600
@@ -106,3 +106,7 @@ win32 {
         QT_WINCONFIG = debug
     }    
 }
+
+TARGET= qdoc3
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
diff -up qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/tools.pro
--- qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3	2009-02-25 15:09:27.000000000 -0600
+++ qt-x11-opensource-src-4.5.0/tools/tools.pro	2009-03-04 09:44:18.000000000 -0600
@@ -13,6 +13,7 @@ no-png {
          SUBDIRS += designer
      }
      SUBDIRS     += linguist
+     SUBDIRS     += qdoc3
      wince*: SUBDIRS = qtestlib designer
      unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
      win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- qt.spec	3 Mar 2009 17:41:58 -0000	1.248
+++ qt.spec	4 Mar 2009 16:05:22 -0000	1.249
@@ -2,7 +2,7 @@
 
 # configure options
 # -no-pch disables precompiled headers, make ccache-friendly
-#define no_pch -no-pch
+%define no_pch -no-pch
 
 Summary: Qt toolkit
 %if 0%{?fedora} > 8
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -41,6 +41,7 @@
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
 Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
+Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 
 ## qt-copy patches
 %define qt_copy 20090303
@@ -70,6 +71,7 @@
 %define psql -plugin-sql-psql
 %define sqlite -plugin-sql-sqlite
 %define phonon -phonon
+%define phonon_backend -no-phonon-backend
 %define webkit -webkit
 %define gtkstyle -gtkstyle
 
@@ -135,8 +137,7 @@
 BuildRequires: mysql-devel >= 4.0
 %endif
 
-%if "%{?phonon}" == "-phonon"
-BuildRequires: glib2-devel
+%if "%{?phonon_backend}" == "-phonon-backend"
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel 
 %endif
@@ -305,6 +306,7 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch10 -p1 -b .ppc64
 %patch50 -p1 -b .qhostaddress
+%patch51 -p1 -b .qdoc3
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -372,7 +374,8 @@
   -no-rpath \
   -reduce-relocations \
   -no-separate-debug-info \
-  %{?phonon} %{!?phonon:-no-phonon} \
+  %{?phonon} \
+  %{?phonon_backend} \
   %{?no_pch} \
   -sm \
   -stl \
@@ -564,14 +567,14 @@
 
 %if 0%{?phonon:1}
 # if building with phonon support, nuke it
-rm -f  %{buildroot}%{_qt4_libdir}/libphonon*
-rm -rf %{buildroot}%{_qt4_headerdir}/phonon/
-rm -rf %{buildroot}%{_qt4_headerdir}/Qt/phonon/
+rm -fv  %{buildroot}%{_qt4_libdir}/libphonon*
+rm -rfv %{buildroot}%{_qt4_headerdir}/phonon/
+rm -rfv %{buildroot}%{_qt4_headerdir}/Qt/phonon/
 # compat symlink ?  maybe put into phonon-devel instead ?
 #ln -s %{_includedir}/KDE/Phonon %{buildroot}%{_qt4_headerdir}/Qt/phonon/
 #ln -s ../KDE/Phonon %{buildroot}%{_qt4_headerdir}/Qt/phonon/
-rm -rf %{buildroot}%{_libdir}/pkgconfig/phonon.pc
-rm -f %{buildroot}%{_qt4_plugindir}/phonon_backend/libphonon_gstreamer.so
+rm -rfv %{buildroot}%{_libdir}/pkgconfig/phonon.pc
+rm -fv %{buildroot}%{_qt4_plugindir}/phonon_backend/libphonon_gstreamer.so
 %endif
 
 
@@ -660,7 +663,6 @@
 %{_qt4_libdir}/libQtSvg.so.*
 %{?webkit:%{_qt4_libdir}/libQtWebKit.so.*}
 %{_qt4_plugindir}/*
-%exclude %{_qt4_plugindir}/designer
 %exclude %{_qt4_plugindir}/sqldrivers
 %if "%{_qt4_bindir}" != "%{_bindir}"
 %{_bindir}/assistant*
@@ -680,6 +682,7 @@
 %{_qt4_bindir}/lupdate*
 %{_qt4_bindir}/moc*
 %{_qt4_bindir}/pixeltool*
+%{_qt4_bindir}/qdoc3*
 %{_qt4_bindir}/qmake*
 %{_qt4_bindir}/qt3to4
 %{_qt4_bindir}/rcc*
@@ -698,6 +701,7 @@
 %{_bindir}/lupdate*
 %{_bindir}/pixeltool*
 %{_bindir}/moc*
+%{_bindir}/qdoc3
 %{_bindir}/qmake*
 %{_bindir}/qt3to4
 %{_bindir}/rcc*
@@ -729,7 +733,6 @@
 %{_libdir}/pkgconfig/*.pc
 # Qt designer
 %{_qt4_bindir}/designer*
-%{_qt4_plugindir}/designer/
 %{_datadir}/applications/*designer*.desktop
 # Qt Linguist
 %{_qt4_bindir}/linguist*
@@ -774,6 +777,11 @@
 
 
 %changelog
+* Wed Mar 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-3
+- -no-phonon-backend
+- include qdoc3
+- move designer plugins to runtime (#487622)
+
 * Tue Mar 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-2
 - License: LGPLv2 with exceptions or GPLv3 with exceptions
 - BR: gstreamer-devel