rpms/qt/devel .cvsignore, 1.48, 1.49 qt.spec, 1.231, 1.232 sources, 1.49, 1.50

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
* Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.0-0.4.rc1
- saner versioned Obsoletes
- -gtkstyle, Obsoletes: qgtkstyle < 0.1
- enable phonon support and associated hackery



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	15 Feb 2009 23:50:18 -0000	1.48
+++ .cvsignore	21 Feb 2009 02:21:22 -0000	1.49
@@ -1,6 +1,5 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.3.tar.bz2
-qt-copy-patches-20090205svn.tar.bz2
 qt-x11-opensource-src-4.5.0-rc1.tar.bz2
-qt-copy-patches-20090215svn.tar.bz2
+qt-copy-patches-20090220svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- qt.spec	16 Feb 2009 10:08:57 -0000	1.231
+++ qt.spec	21 Feb 2009 02:21:22 -0000	1.232
@@ -1,6 +1,9 @@
 # Fedora Review: http://bugzilla.redhat.com/188180
 %define pre -rc1
 
+# --no-pch disables precompiled headers, make ccache-friendly
+#define pch --no-pch
+
 Summary: Qt toolkit
 %if 0%{?fedora} > 8
 Name:    qt
@@ -9,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 0.3.rc1%{?dist}
+Release: 0.4.rc1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: LGPLv2 or GPLv3 with exceptions
@@ -41,7 +44,7 @@
 Patch12: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
 
 ## qt-copy patches
-%define qt_copy 20090215
+%define qt_copy 20090220
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -67,7 +70,9 @@
 %define odbc -plugin-sql-odbc
 %define psql -plugin-sql-psql
 %define sqlite -plugin-sql-sqlite
+%define phonon -phonon
 %define webkit -webkit
+%define gtkstyle -gtkstyle
 
 #define nas -system-nas-sound
 %define nas -no-nas-sound
@@ -131,6 +136,15 @@
 BuildRequires: mysql-devel >= 4.0
 %endif
 
+%if "%{?phonon}" == "-phonon"
+BuildRequires: glib2-devel
+BuildRequires: gstreamer-plugins-base-devel 
+%endif
+
+%if "%{?gtkstyle}" == "-gtkstyle"
+BuildRequires: gtk2-devel
+%endif
+
 %if "%{?psql}" != "-no-sql-psql"
 BuildRequires: postgresql-devel
 # added deps to workaround http://bugzilla.redhat.com/440673
@@ -146,12 +160,13 @@
 BuildRequires: sqlite-devel
 %endif
 
-Obsoletes: qt4-config < %{version}-%{release}
+Obsoletes: qgtkstyle < 0.1
+Obsoletes: qt4-config < 4.5.0
 Provides: qt4-config = %{version}-%{release}
-Obsoletes: qt4-sqlite < %{version}-%{release}
+Obsoletes: qt4-sqlite < 4.5.0 
 Provides: qt4-sqlite = %{version}-%{release}
 %if "%{name}" == "qt"
-Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}4.5.0
 Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
@@ -170,6 +185,10 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: pkgconfig
+%if 0%{?phonon:1}
+# No, let's avoid the circular dependency (for now) -- Rex
+#Requires: phonon-devel
+%endif
 %if 0%{?webkit:1}
 Obsoletes: WebKit-qt-devel < 1.0.0-1
 Provides:  WebKit-qt-devel = 1.0.0-1
@@ -349,11 +368,13 @@
   -cups \
   -fontconfig \
   -largefile \
+  -gtkstyle \
   -qt-gif \
   -no-rpath \
   -reduce-relocations \
   -no-separate-debug-info \
-  -no-phonon -no-gstreamer \
+  %{?phonon} %{!?phonon:-no-phonon} \
+  %{?pch} \
   -sm \
   -stl \
   -system-libmng \
@@ -535,6 +556,18 @@
 # create/own %%_qt4_plugindir/styles
 mkdir %{buildroot}%{_qt4_plugindir}/styles
 
+%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/
+# 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
+%endif
+
 
 %clean
 rm -rf %{buildroot}
@@ -737,6 +770,11 @@
 
 
 %changelog
+* Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.0-0.4.rc1
+- saner versioned Obsoletes
+- -gtkstyle, Obsoletes: qgtkstyle < 0.1
+- enable phonon support and associated hackery
+
 * Mon Feb 16 2009 Than Ngo <than at redhat.com> 4.5.0-0.3.rc1
 - fix callgrindChildExitCode is uninitialzed
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	15 Feb 2009 23:50:18 -0000	1.49
+++ sources	21 Feb 2009 02:21:22 -0000	1.50
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 8eee2774c846fa904e98934d7da6414f  qt-x11-opensource-src-4.5.0-rc1.tar.bz2
-94ae9401e279dc3cbe2b41bf49b3ea44  qt-copy-patches-20090215svn.tar.bz2
+d371c9807e43528ef188be59549e58e1  qt-copy-patches-20090220svn.tar.bz2