rpms/qt4/F-8 qt-x11-opensource-src-4.4.1-systray.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 qt4.spec, 1.83, 1.84 sources, 1.22, 1.23
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Thu Aug 7 04:35:39 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/qt4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063/F-8
Modified Files:
.cvsignore qt4.spec sources
Added Files:
qt-x11-opensource-src-4.4.1-systray.patch
Log Message:
Sync from qt/devel:
* Wed Aug 06 2008 Than Ngo <than at redhat.com> - 4.4.1-2
- fix license tag
- fix Obsoletes: qt-sqlite (missing epoch)
* Tue Aug 05 2008 Than Ngo <than at redhat.com> - 4.4.1-1
- 4.4.1
* Tue Aug 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-17
- fold -sqlite subpkg into main (#454930)
qt-x11-opensource-src-4.4.1-systray.patch:
--- NEW FILE qt-x11-opensource-src-4.4.1-systray.patch ---
--- qt/src/gui/kernel/qwidget.cpp 2008-08-01 16:08:30.000000000 +0100
+++ qt/src/gui/kernel/qwidget.cpp 2008-08-05 11:22:40.000000000 +0100
@@ -9095,8 +9095,6 @@
break;
#endif
case Qt::WA_NativeWindow:
- if (!qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings) && parentWidget())
- parentWidget()->d_func()->enforceNativeChildren();
if (on && !internalWinId() && testAttribute(Qt::WA_WState_Created))
d->createWinId();
break;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-8/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 23 Jul 2008 16:27:52 -0000 1.26
+++ .cvsignore 7 Aug 2008 04:35:09 -0000 1.27
@@ -1,4 +1,4 @@
hi128-app-qt4-logo.png
hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.4.0.tar.bz2
-qt-copy-patches-20080723svn.tar.bz2
+qt-x11-opensource-src-4.4.1.tar.bz2
+qt-copy-patches-20080805svn.tar.bz2
Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-8/qt4.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- qt4.spec 23 Jul 2008 16:27:52 -0000 1.83
+++ qt4.spec 7 Aug 2008 04:35:09 -0000 1.84
@@ -4,21 +4,21 @@
Summary: Qt toolkit
%if 0%{?fedora} > 8
Name: qt
+Epoch: 1
%else
Name: qt4
%endif
-Version: 4.4.0
-Release: 16%{?dist}
+Version: 4.4.1
+Release: 2%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
-License: GPLv3 or GPLv2 with exceptions or QPL
+License: GPLv3 with exceptions or GPLv2 with exceptions
Group: System Environment/Libraries
Url: http://www.trolltech.com/products/qt/
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%{name}" != "qt4"
-Epoch: 1
Obsoletes: qt4 < %{version}-%{release}
Provides: qt4 = %{version}-%{release}
%endif
@@ -37,9 +37,10 @@
# under GNOME, default to QGtkStyle if available
# (otherwise fall back to QCleanlooksStyle)
Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
+Patch10: qt-x11-opensource-src-4.4.1-systray.patch
## qt-copy patches
-%define qt_copy 20080723
+%define qt_copy 20080805
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}}
@@ -144,8 +145,12 @@
Obsoletes: qt4-config < %{version}-%{release}
Provides: qt4-config = %{version}-%{release}
-## libQtScript Obsoletes libqsa ?
-# Obsoletes: qt4-qsa
+Obsoletes: qt4-sqlite < %{version}-%{release}
+Provides: qt4-sqlite = %{version}-%{release}
+%if "%{name}" == "qt"
+Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
%description
Qt is a software toolkit for developing applications.
@@ -239,20 +244,6 @@
%description postgresql
%{summary}.
-%package sqlite
-Summary: SQLite driver for Qt's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: qt4-SQLite < %{version}-%{release}
-Provides: qt4-SQLite = %{version}-%{release}
-%if "%{name}" != "qt4"
-Obsoletes: qt4-sqlite < %{version}-%{release}
-Provides: qt4-sqlite = %{version}-%{release}
-%endif
-
-%description sqlite
-%{summary}.
-
%package x11
Summary: Qt GUI-related libraries
Group: System Environment/Libraries
@@ -287,6 +278,7 @@
%patch5 -p1 -b .bz#437440-as_IN-437440
%patch8 -p1 -b .font-aliases
%patch9 -p1 -b .qgtkstyle
+%patch10 -p1 -b .systray
# drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -568,7 +560,6 @@
%doc README*
%doc LICENSE.GPL2 GPL_EXCEPTION*.TXT
%doc LICENSE.GPL3
-%doc LICENSE.QPL
#config /etc/profile.d/qt4.*
%if "%{_qt4_libdir}" != "%{_libdir}"
/etc/ld.so.conf.d/*
@@ -606,6 +597,7 @@
%{_qt4_libdir}/libQtXmlPatterns.so.*
%dir %{_qt4_plugindir}
%dir %{_qt4_plugindir}/sqldrivers/
+%{_qt4_plugindir}/sqldrivers/libqsqlite*
%{_qt4_translationdir}/
%files x11
@@ -732,14 +724,18 @@
%{_qt4_plugindir}/sqldrivers/libqsqlmysql*
%endif
-%if "%{?sqlite}" == "-plugin-sql-sqlite"
-%files sqlite
-%defattr(-,root,root,-)
-%{_qt4_plugindir}/sqldrivers/libqsqlite*
-%endif
-
%changelog
+* Wed Aug 06 2008 Than Ngo <than at redhat.com> - 4.4.1-2
+- fix license tag
+- fix Obsoletes: qt-sqlite (missing epoch)
+
+* Tue Aug 05 2008 Than Ngo <than at redhat.com> - 4.4.1-1
+- 4.4.1
+
+* Tue Aug 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-17
+- fold -sqlite subpkg into main (#454930)
+
* Wed Jul 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-16
- qt-copy-patches-20080723 (kde#162793)
- omit deprecated phonon bits
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-8/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 23 Jul 2008 16:27:52 -0000 1.22
+++ sources 7 Aug 2008 04:35:09 -0000 1.23
@@ -1,4 +1,4 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
-03ee0deb73908c84a7b4d9ceb5f8b3f6 qt-x11-opensource-src-4.4.0.tar.bz2
-bb7e7e6aa739c0c87e3cb3dbfe0fa814 qt-copy-patches-20080723svn.tar.bz2
+a94a6f5ef01598bb9980891f2515ff45 qt-x11-opensource-src-4.4.1.tar.bz2
+21597a6486886398a7b771d240ad346b qt-copy-patches-20080805svn.tar.bz2
More information about the fedora-extras-commits
mailing list