rpms/qt4/devel qt4.spec,1.77,1.77.2.1 sources,1.18,1.18.2.1
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Sat Dec 22 20:28:27 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10995
Modified Files:
Tag: qt4-qt44-branch
qt4.spec sources
Log Message:
qt-4.4.0-tp1, +cvs tag/branch (cross fingers)
Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.77
retrieving revision 1.77.2.1
diff -u -r1.77 -r1.77.2.1
--- qt4.spec 21 Dec 2007 18:12:45 -0000 1.77
+++ qt4.spec 22 Dec 2007 20:27:52 -0000 1.77.2.1
@@ -1,16 +1,19 @@
# Fedora Review: http://bugzilla.redhat.com/188180
+%define beta tp1
+%define preview -preview
+
Summary: Qt toolkit
Name: qt4
-Version: 4.3.3
-Release: 2%{?dist}
+Version: 4.4.0
+Release: 0.2.tp1%{?dist}
# GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv2
Group: System Environment/Libraries
Url: http://www.trolltech.com/products/qt/
-Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
+Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%{name}" != "qt4"
@@ -26,9 +29,11 @@
Source5: qconfig-multilib.h
# search for assistant-qt4 instead of (qt3's) assistant in $PATH
-Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
+Patch1: qt-x11-opensource-src-4.4.0-qassistant-qt4.patch
# multilib hacks
Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
+# build-fix
+Patch3: qt-x11-preview-opensource-src-4.4.0-tp1-fix-build.patch
## qt-copy patches
Source10: qt4-wrapper.sh
@@ -52,6 +57,7 @@
%define odbc -plugin-sql-odbc
%define psql -plugin-sql-psql
%define sqlite -plugin-sql-sqlite
+%define phonon -phonon
# undefine to disable these
%define nas -system-nas-sound
@@ -82,15 +88,16 @@
BuildRequires: findutils
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
+BuildRequires: glib2-devel
+%{?phonon:BuildRequires: gstreamer-devel gstreamer-plugins-base-devel}
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: libungif-devel
-BuildRequires: freetype-devel
-BuildRequires: zlib-devel
-BuildRequires: glib2-devel
BuildRequires: openssl-devel
+BuildRequires: zlib-devel
+
## In theory, should be as simple as:
#define x_deps libGL-devel libGLU-devel
@@ -186,6 +193,16 @@
%description mysql
%{summary}.
+%package phonon-devel
+Summary: Phonon development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+# FIXME
+Conflicts: kdelibs4-devel
+
+%description phonon-devel
+%{summary}.
+
%package postgresql
Summary: PostgreSQL driver for Qt's SQL classes
Group: System Environment/Libraries
@@ -206,6 +223,16 @@
%description sqlite
%{summary}.
+%package webkit-devel
+Summary: WebKit development files for %{name}
+Group: System Environment/Libraries
+# FIXME
+Conflicts: WebKit-qt-devel
+Requires: %{name}-devel = %{version}-%{release}
+
+%description webkit-devel
+%{summary}.
+
%package x11
Summary: Qt GUI-related libraries
Group: System Environment/Libraries
@@ -218,18 +245,16 @@
%prep
-%if "%{?snap:1}" == "1"
-%setup -q -n qt-x11%{?preview}-opensource-src-%{version}-%{snap}
-%else
-%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta}
-%endif
+%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}
-%patch1 -p1 -b .assistant4
+%patch1 -p1 -b .qassistant-qt4
# don't use -b on mkspec files, else they get installed too.
%patch2 -p1
+%patch3 -p1 -b .build-fix
-# drop -fexceptions from $RPM_OPT_FLAGS
-RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
+## drop -fexceptions from $RPM_OPT_FLAGS
+#define no_exceptions -no-exceptions
+#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
## customize our platform
%if "%{_lib}" == "lib64"
@@ -287,7 +312,6 @@
-release \
-shared \
-cups \
- -no-exceptions \
-fontconfig \
-largefile \
-qt-gif \
@@ -309,7 +333,11 @@
-xrender \
-xkb \
-glib \
+ -gstreamer \
-openssl \
+ -webkit \
+ -xmlpatterns \
+ %{?phonon} %{!?phonon:-no-phonon } \
%{?qdbus} %{!?qdbus:-no-qdbus} \
%{?nas} %{!?nas:-no-nas-sound} \
%{?mysql} \
@@ -334,7 +362,7 @@
## pkg-config
# strip extraneous dirs/libraries -- Rex
# safe ones
-glib2_libs=$(pkg-config --libs glib-2.0 gthread-2.0)
+glib2_libs=$(pkg-config --libs glib-2.0 gthread-2.0 2>/dev/null || echo '-pthread -lgthread-2.0 -lrt -lglib-2.0')
for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz \
-L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la ||:
@@ -355,7 +383,11 @@
ln -s ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc
# put LICENSE.* files in %%_qt4_prefix, some apps' configure scripts expect to find them here
+%if 0%{?beta:1}
+install -p -m644 LICENSE.PREVIEW.OPENSOURCE %{buildroot}%{_qt4_prefix}/
+%else
install -p -m644 LICENSE.GPL %{buildroot}%{_qt4_prefix}/
+%endif
## Make symlinks in %%_bindir
%if "%{_bindir}" != "%{_qt4_bindir}"
@@ -503,9 +535,10 @@
%files
%defattr(-,root,root,-)
%doc README*
+%{?beta: %doc LICENSE.PREVIEW.OPENSOURCE}
%{!?beta:%doc OPENSOURCE-NOTICE.TXT}
-%doc LICENSE.GPL GPL_EXCEPTION*.TXT
-%{_qt4_prefix}/LICENSE.GPL
+%{!?beta:%doc LICENSE.GPL GPL_EXCEPTION*.TXT}
+%{_qt4_prefix}/LICENSE.*
%if "%{_qt4_libdir}" != "%{_libdir}"
/etc/ld.so.conf.d/*
%dir %{_qt4_libdir}
@@ -538,11 +571,16 @@
%{_sysconfdir}/rpm/macros.*
%{_qt4_libdir}/libQt3Support.so.*
%{_qt4_libdir}/libQtAssistantClient.so.*
+%{_qt4_libdir}/libQtCLucene.so.*
%{_qt4_libdir}/libQtDesigner.so.*
%{_qt4_libdir}/libQtDesignerComponents.so.*
%{_qt4_libdir}/libQtGui.so.*
+%{_qt4_libdir}/libQtHelp.so.*
%{_qt4_libdir}/libQtOpenGL.so.*
%{_qt4_libdir}/libQtSvg.so.*
+%{_qt4_libdir}/libQtWebKit.so.*
+%{_qt4_libdir}/libQtXmlPatterns.so.*
+%{?phonon:%{_qt4_libdir}/libphonon.so.*}
%{_qt4_plugindir}/*
%exclude %{_qt4_plugindir}/designer
%exclude %{_qt4_plugindir}/sqldrivers
@@ -562,6 +600,8 @@
%{_qt4_bindir}/lupdate*
%{_qt4_bindir}/moc*
%{_qt4_bindir}/pixeltool*
+%{_qt4_bindir}/qcollectiongenerator*
+%{_qt4_bindir}/qhelp*
%{_qt4_bindir}/qmake*
%{_qt4_bindir}/qt3to4
%{_qt4_bindir}/rcc*
@@ -570,6 +610,8 @@
%{_bindir}/lupdate*
%{_bindir}/pixeltool*
%{_bindir}/moc*
+%{_bindir}/qcollectiongenerator*
+%{_bindir}/qhelp*
%{_bindir}/qmake*
%{_bindir}/qt3to4
%{_bindir}/rcc*
@@ -578,6 +620,10 @@
%dir %{_qt4_headerdir}/
%endif
%{_qt4_headerdir}/*
+%exclude %{_qt4_headerdir}/Qt/QtWebKit/
+%exclude %{_qt4_headerdir}/QtWebKit/
+%{?phonon:%exclude %{_qt4_headerdir}/phonon/}
+%{?phonon:%exclude %{_qt4_headerdir}/Qt/phonon*}
%{_qt4_datadir}/mkspecs/
%{_qt4_prefix}/mkspecs/
%{_qt4_datadir}/q3porting.xml
@@ -586,6 +632,8 @@
%{_qt4_libdir}/libQt*.a
%{_qt4_libdir}/libQt*.prl
%{_libdir}/pkgconfig/*.pc
+%exclude %{_libdir}/pkgconfig/QtWebKit.pc
+%{?phonon:%exclude %{_libdir}/pkgconfig/phonon.pc}
# Qt designer
%{_bindir}/designer*
%{_qt4_bindir}/designer*
@@ -604,13 +652,30 @@
%{_qt4_prefix}/doc
%{_qt4_demosdir}/
%{_qt4_examplesdir}/
-# Qt Assistant (bin moved to -x11)
+# Qt Assistant (bins moved to -x11)
%{_datadir}/applications/*assistant*.desktop
# Qt Demo
%{_qt4_bindir}/qt*demo*
%{_bindir}/qt*demo*
%{_datadir}/applications/*qtdemo*.desktop
+%if 0%{?phonon:1}
+%files phonon-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/phonon.pc
+%{_qt4_headerdir}/phonon/
+%{_qt4_headerdir}/Qt/phonon*
+%{_qt4_libdir}/libphonon.so
+%{_qt4_libdir}/libphonon.prl
+%endif
+
+%files webkit-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/QtWebKit.pc
+%{_qt4_headerdir}/Qt/QtWebKit/
+%{_qt4_headerdir}/QtWebKit/
+%{_qt4_libdir}/libQtWebKit.so
+
%if "%{?odbc}" == "-plugin-sql-odbc"
%files odbc
%defattr(-,root,root,-)
@@ -637,6 +702,11 @@
%changelog
+* Fri Dec 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.4.0-0.2.tp1
+- qt-4.4.0-tp1
+- -phonon-devel: subpkg to include bits conflicting with kdelibs(4)-devel-4.0
+- -WebKit-devel: subpkg to include bits conflicting with WebKit-qt-devel
+
* Fri Dec 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-2
- -doc: Requires: %%name-assistant, omit assistant bin,
-x11: Provides: %%name-assistant (#147948)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/sources,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- sources 5 Dec 2007 23:59:37 -0000 1.18
+++ sources 22 Dec 2007 20:27:52 -0000 1.18.2.1
@@ -1,3 +1,2 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
-19678fe35170559cd6a6fa531c57799c qt-x11-opensource-src-4.3.3.tar.gz
More information about the fedora-extras-commits
mailing list