rpms/qt4/devel .cvsignore, 1.5, 1.6 qt4.spec, 1.17, 1.18 sources, 1.3, 1.4
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Aug 1 15:28:13 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10245
Modified Files:
.cvsignore qt4.spec sources
Log Message:
* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.4.tp1
- strip -laudio, -ldbus-1, -lglib-2.0 from .pc files
* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.3.tp1
- -no-reduce-exports (for now)
- -fno-strict-aliasing (fc5+)
* Fri Jul 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.2.tp1
- -system-nas-sound, BR: nas-devel (bug # 197937)
- -qdbus (fc6+, BR: dbus-devel >= 0.62)
- -glib (BR: glib2-devel)
* Fri Jun 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.1.tp1
- 4.2.0-tp1 (technology preview 1)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 20 Jul 2006 12:12:36 -0000 1.5
+++ .cvsignore 1 Aug 2006 15:28:13 -0000 1.6
@@ -1,4 +1,5 @@
clog
qt-x11-opensource-src-4.1.4.tar.gz
qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
+qt41.spec
Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qt4.spec 20 Jul 2006 19:32:17 -0000 1.17
+++ qt4.spec 1 Aug 2006 15:28:13 -0000 1.18
@@ -1,19 +1,22 @@
# Fedora Review
-# http://bugzilla.redhat.com/bugzilla/188180
+# http://bugzilla.redhat.com/188180
+
+%define beta tp1
+%define preview -preview
Summary: Qt toolkit
Name: qt4
-Version: 4.1.4
-Release: 8%{?dist}
+Version: 4.2.0
+Release: 0.4.%{beta}%{?dist}
License: GPL/QPL
Group: System Environment/Libraries
Url: http://www.trolltech.com/products/qt/
-Source0: ftp://ftp.troll.no/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)
-# search for assistant4 instead of (qt3's) assistant in $PATH
+# search for assistant-qt4 instead of (qt3's) assistant in $PATH
Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch
Source10: qt4-wrapper.sh
@@ -27,7 +30,7 @@
## optional plugin bits
# set to -no-sql-<driver> to disable
# set to -qt-sql-<driver> to enable *in* qt library
-%define mysql -no-sql-mysql
+%define mysql -no-sql-mysql
%if "%{?fedora}" > "3"
%define mysql -plugin-sql-mysql
%endif
@@ -37,8 +40,12 @@
%define odbc -plugin-sql-odbc
%define psql -plugin-sql-psql
%define sqlite -plugin-sql-sqlite
-#
+# undefine to disable these
%define nas -system-nas-sound
+%if "%{?fedora}" > "5"
+%define qdbus -qdbus
+BuildRequires: dbus-devel >= 0.62
+%endif
%define qt_dirname %{name}
%define qtdir %{_libdir}/%{qt_dirname}
@@ -68,6 +75,7 @@
BuildRequires: libungif-devel
BuildRequires: freetype-devel
BuildRequires: zlib-devel
+BuildRequires: glib2-devel
%define x_deps libGL-devel libGLU-devel
%if "%{?fedora}" > "4"
@@ -185,13 +193,13 @@
%prep
-%setup -q -n qt-x11-opensource-src-%{version}
+%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}
%patch1 -p1 -b .assistant4
# drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
-# add -fno-strict-aliasing, for now
+# add -fno-strict-aliasing, for now (fc6+)
%if "%{?fedora}" > "4"
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%endif
@@ -248,6 +256,8 @@
-xrandr \
-xrender \
-xkb \
+ -glib \
+ %{?qdbus} %{!?qdbus:-no-qdbus} \
%{?nas} %{!?nas:-no-nas-sound} \
%{?mysql} %{?mysql_include} %{?mysql_ldflags} \
%{?psql} \
@@ -272,7 +282,7 @@
## pkg-config
# strip extraneous dirs/libraries -- Rex
# safe ones
-for dep in -laudio -lglib-2.0 -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} \
+for dep in -laudio -ldbus-1 -lglib-2.0 -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} \
-L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||:
sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc
@@ -355,6 +365,9 @@
%dir %{qtdir}/bin/
%dir %{qt_datadir}
%{qt_libdir}/libQtCore.so.*
+%if "%{?qdbus}" == "-qdbus"
+%{qt_libdir}/libQtDBus.so.*
+%endif
%{qt_libdir}/libQtNetwork.so.*
%{qt_libdir}/libQtSql.so.*
%{qt_libdir}/libQtTest.so.*
@@ -369,9 +382,11 @@
%{qt_libdir}/libQtGui.so.*
%{qt_libdir}/libQtOpenGL.so.*
%{qt_libdir}/libQtSvg.so.*
-%{qtdir}/plugins/accessible/
-%{qtdir}/plugins/imageformats/
-%{qtdir}/plugins/inputmethods/
+%if "%{version}" >= "4.2.0"
+%{qt_libdir}/libQtAssistantClient.so.*
+%endif
+%{qtdir}/plugins/*
+%exclude %{qtdir}/plugins/sqldrivers
#-config bits
%{qtdir}/bin/qt*config*
%{_bindir}/qt*config*
@@ -464,16 +479,20 @@
%changelog
-* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-8
-- strip -laudio, -lglib-2.0 from .pc files
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.4.tp1
+- strip -laudio, -ldbus-1, -lglib-2.0 from .pc files
-* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-7
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.3.tp1
- -no-reduce-exports (for now)
- -fno-strict-aliasing (fc5+)
-* Thu Jul 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-6
-- make buildable on legacy releases
-- -system-nas-sound (bug #197937)
+* Fri Jul 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.2.tp1
+- -system-nas-sound, BR: nas-devel (bug # 197937)
+- -qdbus (fc6+, BR: dbus-devel >= 0.62)
+- -glib (BR: glib2-devel)
+
+* Fri Jun 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.1.tp1
+- 4.2.0-tp1 (technology preview 1)
* Thu Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-5
- make FHS-friendly (bug #196901)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 23 Jun 2006 15:11:02 -0000 1.3
+++ sources 1 Aug 2006 15:28:13 -0000 1.4
@@ -1 +1 @@
-88f8c9c4622108baca2950baac3c02d6 qt-x11-opensource-src-4.1.4.tar.gz
+099a99d1b72b4be752fe0e211bc32dcf qt-x11-preview-opensource-src-4.2.0-tp1.tar.gz
More information about the fedora-extras-commits
mailing list