Hello community,
here is the log from the commit of package libqt4 for openSUSE:Factory
checked in at Thu Dec 17 16:46:55 CET 2009.
--------
--- libqt4/libqt4-devel-doc-data.changes 2009-11-13 13:52:29.000000000 +0100
+++ libqt4/libqt4-devel-doc-data.changes 2009-12-12 18:22:21.000000000 +0100
@@ -1,0 +2,21 @@
+Sat Dec 12 17:13:27 UTC 2009 - aj@suse.de
+
+- Add libqt4-libtool-nodate.diff to not write date to libtool generated files.
+
+-------------------------------------------------------------------
+Fri Dec 4 23:16:01 UTC 2009 - dmueller@suse.de
+
+- fix filelist conflict libqt4-devel/libQtWebkit-devel
+
+-------------------------------------------------------------------
+Thu Dec 3 01:18:34 CET 2009 - dmueller@suse.de
+
+- update to 4.6.0:
+ * for a detailed list of changes, see the included changes-4.6.0
+
+-------------------------------------------------------------------
+Wed Dec 2 10:00:00 CET 2009 - kruber@zib.de
+
+- fixed building of libqt4-devel-doc
+
+-------------------------------------------------------------------
@@ -11,0 +33,13 @@
+Fri Oct 30 14:30:00 CET 2009 - Nico.Laus.2001@gmx.de
+
+- build && install qdoc3, needed for qt-creator
+ (patch from dmueller@suse.de that went into libqt = 4.5 but not here)
+
+-------------------------------------------------------------------
+Thu Oct 22 11:56:41 UTC 2009 - tittiatcoke@gmail.com
+
+- Rearranged how the packages of Qt 4.6 are build
+ + Main libraries are now build from libqt4
+ + New package that contains examples and demos
+
+-------------------------------------------------------------------
@@ -16,0 +51,5 @@
+Thu Oct 15 23:54:46 CEST 2009 - dmueller@suse.de
+
+- backport for SLE11-SP1 (FATE#306930)
+
+-------------------------------------------------------------------
@@ -108,0 +148,5 @@
+
+-------------------------------------------------------------------
+Thu Feb 5 12:53:42 CET 2009 - dmueller@suse.de
+
+- fix baselibs.conf (bnc#472311)
New Changes file:
--- /dev/null 2009-09-30 08:50:26.000000000 +0200
+++ libqt4/libqt4-devel-doc.changes 2009-12-12 18:22:21.000000000 +0100
@@ -0,0 +1,1594 @@
+-------------------------------------------------------------------
+Sat Dec 12 17:13:27 UTC 2009 - aj@suse.de
+
+- Add libqt4-libtool-nodate.diff to not write date to libtool generated files.
+
+-------------------------------------------------------------------
+Fri Dec 4 23:16:01 UTC 2009 - dmueller@suse.de
+
+- fix filelist conflict libqt4-devel/libQtWebkit-devel
+
+-------------------------------------------------------------------
+Thu Dec 3 01:18:34 CET 2009 - dmueller@suse.de
+
+- update to 4.6.0:
+ * for a detailed list of changes, see the included changes-4.6.0
+
+-------------------------------------------------------------------
+Wed Dec 2 10:00:00 CET 2009 - kruber@zib.de
+
+- fixed building of libqt4-devel-doc
+
+-------------------------------------------------------------------
+Fri Nov 13 13:51:36 CET 2009 - dmueller@suse.de
+
+- strip timestamp from rcc as well (bnc#554462)
+
+-------------------------------------------------------------------
+Fri Nov 13 11:53:01 CET 2009 - dmueller@suse.de
+
+- refresh patches
+
+-------------------------------------------------------------------
+Fri Oct 30 14:30:00 CET 2009 - Nico.Laus.2001@gmx.de
+
+- build && install qdoc3, needed for qt-creator
+ (patch from dmueller@suse.de that went into libqt = 4.5 but not here)
+
+-------------------------------------------------------------------
+Thu Oct 22 11:56:41 UTC 2009 - tittiatcoke@gmail.com
+
+- Rearranged how the packages of Qt 4.6 are build
+ + Main libraries are now build from libqt4
+ + New package that contains examples and demos
+
+-------------------------------------------------------------------
+Mon Oct 19 15:20:51 CEST 2009 - dmueller@suse.de
+
+- fix memory leak in QPixmapFilter (bnc#547896)
+
+-------------------------------------------------------------------
+Thu Oct 15 23:54:46 CEST 2009 - dmueller@suse.de
+
+- backport for SLE11-SP1 (FATE#306930)
+
+-------------------------------------------------------------------
+Thu Oct 15 12:12:54 CEST 2009 - dmueller@suse.de
+
+- fix QTimer(0) regression
+
+-------------------------------------------------------------------
+Mon Oct 12 18:05:50 CEST 2009 - dmueller@suse.de
+
+- compile with xsync support
+- fix translation build
+
+-------------------------------------------------------------------
+Mon Oct 12 16:03:29 CEST 2009 - dmueller@suse.de
+
+- update to 4.5.3:
+ * for detailed changelog see included changes-4.5.3
+- fix deadlock in dbus bindings (bnc#482749)
+
+-------------------------------------------------------------------
+Tue Jul 28 18:31:05 CEST 2009 - dmueller@novell.com
+
+- disable use of x shared pixmaps, not supported by newer
+ drivers anymore and very slow anyway
+- Fix QMenu not respecting minimum width, this affects
+ the Plasma taskabar
+- Fix X11 timestamp issues which cause clipboard synchronisation
+ bugs
+
+-------------------------------------------------------------------
+Wed Jun 24 17:32:40 CEST 2009 - sbrabec@suse.cz
+
+- Packageand supplement 32bit packages in baselibs.conf
+ (bnc#354164).
+- %plugindir/codecs moved to libqt4, as it is used by QtCore.
+- %plugindir subdirs moved to packages, where it logically belong.
+
+-------------------------------------------------------------------
+Wed Jun 17 22:24:07 CEST 2009 - dmueller@suse.de
+
+- fix use-after-free issue (CVE-2009-0945, bnc#512559)
+
+-------------------------------------------------------------------
+Sun May 31 17:31:45 CEST 2009 - dmueller@suse.de
+
+- add patches:
+ * Fix deserialization of values with custom types
+ * Make sure syncqt creates the Phonon/Global file.
+ * Fix huge memory leak in QPixmapCache
+ * Do not deduce scrollbar extent twice
+
+-------------------------------------------------------------------
+Thu Apr 23 22:00:12 CEST 2009 - beineri@opensuse.org
+
+- update to 4.5.1:
+ * for detailed changelog see included changes-4.5.1
+
+-------------------------------------------------------------------
+Tue Mar 3 22:38:50 CET 2009 - beineri@opensuse.org
+
+- fix build
+
+-------------------------------------------------------------------
+Tue Mar 3 10:34:50 CET 2009 - dmueller@suse.de
+
+- update to 4.5.0 final:
+ * licensing change. LGPLv2.1 or later is a new option
+
+-------------------------------------------------------------------
+Sun Mar 1 22:07:48 CET 2009 - dmueller@suse.de
+
+- update to 4.5.0 RC2:
+ * for detailed changelog, see included changes-4.5.0
+- build && install qdoc3, needed for qt-creator
+
+-------------------------------------------------------------------
+Wed Feb 11 19:40:26 CET 2009 - dmueller@suse.de
+
+- use minimal-toc for ppc64
+
+-------------------------------------------------------------------
+Wed Feb 11 17:02:13 CET 2009 - coolo@suse.de
+
+- do not include a timestamp in includeguards either
+
+-------------------------------------------------------------------
+Fri Feb 6 19:01:05 CET 2009 - coolo@suse.de
+
+- do not include a timestamp in files generated from .ui either
+
+-------------------------------------------------------------------
+Fri Feb 6 11:37:00 CET 2009 - dmueller@suse.de
+
+- fix QTestLib build again
+
+-------------------------------------------------------------------
+Thu Feb 5 12:53:42 CET 2009 - dmueller@suse.de
+
+- fix baselibs.conf (bnc#472311)
+
+-------------------------------------------------------------------
+Thu Feb 5 12:06:44 CET 2009 - dmueller@suse.de
+
+- update to 4.5.0 RC1:
+ * for detaled changelog, see included changes-4.5.0
+ * add missing libqt4-sql-sqlite baselib (bnc#472311)
+
+-------------------------------------------------------------------
+Tue Jan 27 23:12:29 CET 2009 - dmueller@suse.de
+
+- drop 0258-windowsxpstyle-qbrush.diff, rejected upstream
+- fix qmake path separators
+- fix zero height qpixmaps not being considered null
+- fix crash in formlayouting
+
+-------------------------------------------------------------------
+Thu Jan 15 12:08:02 CET 2009 - dmueller@suse.de
+
+- add libQtWebKit4 to baselibs.conf
+- do not hardcode build date in generated moc files
+
+-------------------------------------------------------------------
+Tue Jan 13 12:34:56 CET 2009 - olh@suse.de
+
+- obsolete old -XXbit packages (bnc#437293)
+
+-------------------------------------------------------------------
+Mon Jan 5 16:24:36 CET 2009 - dmueller@suse.de
+
+- remove hardcoded legacy font mapping (bnc#448012)
+
+-------------------------------------------------------------------
+Fri Dec 5 09:27:20 CET 2008 - dmueller@suse.de
+
+- add 32bit modules (bnc#354164)
+- sync before setting own X error handler
+- fix crashes caused by animation in QTreeView (kde#176045)
+
+-------------------------------------------------------------------
+Mon Nov 17 20:38:09 CET 2008 - dmueller@suse.de
+
+- add patch for recursive painting crash (maybe fixes bnc#444591)
+- fix major performance regression in QUrl
+- fix windows xp style painting
++++ 1397 more lines (skipped)
++++ between /dev/null
++++ and libqt4/libqt4-devel-doc.changes
--- libqt4/libqt4-sql-plugins.changes 2009-11-13 13:52:29.000000000 +0100
+++ libqt4/libqt4-sql-plugins.changes 2009-12-12 18:22:21.000000000 +0100
@@ -1,0 +2,21 @@
+Sat Dec 12 17:13:27 UTC 2009 - aj@suse.de
+
+- Add libqt4-libtool-nodate.diff to not write date to libtool generated files.
+
+-------------------------------------------------------------------
+Fri Dec 4 23:16:01 UTC 2009 - dmueller@suse.de
+
+- fix filelist conflict libqt4-devel/libQtWebkit-devel
+
+-------------------------------------------------------------------
+Thu Dec 3 01:18:34 CET 2009 - dmueller@suse.de
+
+- update to 4.6.0:
+ * for a detailed list of changes, see the included changes-4.6.0
+
+-------------------------------------------------------------------
+Wed Dec 2 10:00:00 CET 2009 - kruber@zib.de
+
+- fixed building of libqt4-devel-doc
+
+-------------------------------------------------------------------
@@ -11,0 +33,13 @@
+Fri Oct 30 14:30:00 CET 2009 - Nico.Laus.2001@gmx.de
+
+- build && install qdoc3, needed for qt-creator
+ (patch from dmueller@suse.de that went into libqt = 4.5 but not here)
+
+-------------------------------------------------------------------
+Thu Oct 22 11:56:41 UTC 2009 - tittiatcoke@gmail.com
+
+- Rearranged how the packages of Qt 4.6 are build
+ + Main libraries are now build from libqt4
+ + New package that contains examples and demos
+
+-------------------------------------------------------------------
@@ -16,0 +51,5 @@
+Thu Oct 15 23:54:46 CEST 2009 - dmueller@suse.de
+
+- backport for SLE11-SP1 (FATE#306930)
+
+-------------------------------------------------------------------
@@ -108,0 +148,5 @@
+
+-------------------------------------------------------------------
+Thu Feb 5 12:53:42 CET 2009 - dmueller@suse.de
+
+- fix baselibs.conf (bnc#472311)
libqt4.changes: same change
calling whatdependson for head-i586
Old:
----
0019-Make-QMenu-respect-the-minimum-width-set.patch
0280-deserialization-custom-dbus-properties.diff
0283-do-not-deduce-scrollbar-extent-twice.diff
avoid-dbus-deadlock.diff
disable-callgrind.diff
display-key-support.diff
filter-leak-fix.patch
fix-xsync-flag.diff
glib-eventloop-regression.diff
ignore-global-advance-width-in-fots.diff
libQtWebKit-devel.changes
libQtWebKit-devel.spec
libQtWebKit-devel.spec.in
qt-x11-opensource-src-4.5.3.tar.bz2
New:
----
ignore-global-advance-width-in-fonts.diff
libqt4-devel-doc.changes
libqt4-devel-doc.spec
libqt4-devel-doc.spec.in
libqt4-libtool-nodate.diff
minimal-toc-for-webkit.diff
qt-everywhere-opensource-src-4.6.0.tar.bz2
webkit-ia64_s390x.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100
+++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libqt4-devel-doc-data (Version 4.5.3)
+# spec file for package libqt4-devel-doc-data (Version 4.6.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,6 +25,15 @@
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
+# COMMON-VERSION-BEGIN
+# COMMON-VERSION-BEGIN
+Version: 4.6.0
+Release: 1
+%define base_name libqt4
+%define x11_free -everywhere-opensource-src-
+%define rversion 4.6.0
+# COMMON-VERSION-END
+# COMMON-VERSION-END
Url: http://www.trolltech.com
License: QPL, GPL
Group: System/Libraries
@@ -34,11 +43,6 @@
%requires_eq libqt4
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 4.5.3
-Release: 4
-%define base_name libqt4
-%define x11_free -x11-opensource-src-
-%define rversion 4.5.3
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -55,30 +59,20 @@
Patch39: 0191-listview-alternate-row-colors.diff
Patch40: 0188-fix-moc-parser-same-name-header.diff
Patch43: 0195-compositing-properties.diff
-Patch55: ignore-global-advance-width-in-fots.diff
+Patch55: ignore-global-advance-width-in-fonts.diff
Patch60: 0180-window-role.diff
Patch61: qt4-fake-bold.patch
Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch
Patch75: qt-debug-timer.diff
Patch87: qfatal-noreturn.diff
-Patch90: display-key-support.diff
Patch101: no-moc-date.diff
Patch102: 0253-qmake_correct_path_separators.diff
-Patch105: disable-callgrind.diff
Patch106: build-install-qdoc3.diff
-Patch108: 0280-deserialization-custom-dbus-properties.diff
-Patch111: 0283-do-not-deduce-scrollbar-extent-twice.diff
-Patch113: 0019-Make-QMenu-respect-the-minimum-width-set.patch
-Patch114: avoid-dbus-deadlock.diff
-Patch116: fix-xsync-flag.diff
-Patch117: glib-eventloop-regression.diff
-Patch118: filter-leak-fix.patch
+Patch107: webkit-ia64_s390x.patch
+Patch108: minimal-toc-for-webkit.diff
+Patch109: libqt4-libtool-nodate.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if %suse_version > 910
- %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -xsync
-%else
- %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -no-xrender -no-xrandr -no-xinerama -no-xshape -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -no-exceptions -system-libtiff -no-sm -no-opengl -no-xcursor -no-webkit -no-xmlpatterns
-%endif
+ %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
%define check_config \
grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \
if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \
@@ -114,25 +108,17 @@
%patch43
%patch55
%patch60
-%if %suse_version > 910
# bnc#374073 comment #8
# %patch61
-%endif
%patch70
%patch75
%patch87
-%patch90
%patch101
%patch102
-%patch105
%patch106
+%patch107
%patch108
-%patch111
-%patch113 -p1
-%patch114 -p1
-%patch116
-%patch117 -p1
-%patch118
+%patch109
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
++++++ libqt4-devel-doc.spec ++++++
#
# spec file for package libqt4-devel-doc (Version 4.6.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
# nodebuginfo
Name: libqt4-devel-doc
BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel
BuildRequires: glib2-devel libqt4-devel sqlite3-devel
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
# COMMON-VERSION-BEGIN
# COMMON-VERSION-BEGIN
Version: 4.6.0
Release: 1
%define base_name libqt4
%define x11_free -everywhere-opensource-src-
%define rversion 4.6.0
# COMMON-VERSION-END
# COMMON-VERSION-END
Url: http://www.trolltech.com
License: QPL, GPL
Group: Documentation/HTML
Summary: Qt documentation
Requires: libqt4 = %version
Requires: libqt4-devel-doc-data = %version
Requires: libqt4-sql-sqlite >= %version
Provides: libqt4-examples = 4.4.0
Obsoletes: libqt4-examples <= 4.4.0
Provides: qt-devel-doc = 4.4.0
Obsoletes: qt-devel-doc <= 4.4.0
# COMMON-BEGIN
# COMMON-BEGIN
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
Source12: linguist4.desktop
Source13: assistant4.desktop
Source14: assistant.png
Source15: designer.png
Source16: linguist.png
Patch2: qt-never-strip.diff
Patch3: plastik-default.diff
Patch6: use-freetype-default.diff
Patch1006: use-freetype-default-legacy.diff
Patch8: link-tools-shared.diff
Patch39: 0191-listview-alternate-row-colors.diff
Patch40: 0188-fix-moc-parser-same-name-header.diff
Patch43: 0195-compositing-properties.diff
Patch55: ignore-global-advance-width-in-fonts.diff
Patch60: 0180-window-role.diff
Patch61: qt4-fake-bold.patch
Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch
Patch75: qt-debug-timer.diff
Patch87: qfatal-noreturn.diff
Patch101: no-moc-date.diff
Patch102: 0253-qmake_correct_path_separators.diff
Patch106: build-install-qdoc3.diff
Patch107: webkit-ia64_s390x.patch
Patch108: minimal-toc-for-webkit.diff
Patch109: libqt4-libtool-nodate.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
%define check_config \
grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \
if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \
cmp /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \
fi \
%description
Qt is a set of libraries for developing applications.
This package contains base tools, like string, xml, and network
handling.
Authors:
--------
Qt Software
%prep
%define plugindir %_libdir/qt4/plugins
%setup -q -n qt%x11_free%rversion
%patch2
%patch3
%if %suse_version > 1010
%patch6
%else
%patch1006
%endif
# needs rediffing
#%patch8
%patch39
%patch40
%patch43
%patch55
%patch60
# bnc#374073 comment #8
# %patch61
%patch70
%patch75
%patch87
%patch101
%patch102
%patch106
%patch107
%patch108
%patch109
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
# COMMON-END
%package -n qt4-x11-tools
License: QPL, GPL
Group: System/Libraries
Summary: C++ Program Library, Core Components
Requires: libqt4-x11 >= %version
%description -n qt4-x11-tools
Qt is a set of libraries for developing applications.
This package contains base tools, like string, xml, and network
handling.
Authors:
--------
Troll Tech AS, Norway
%build
%ifarch ppc64
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
%endif
export QTDIR=$PWD
export PATH=$PWD/bin:$PATH
export LD_LIBRARY_PATH=$PWD/lib/
sed -i -e "/^QMAKE_CFLAGS_RELEASE[ \t]*+=/s,\$, $RPM_OPT_FLAGS," mkspecs/common/g++.conf
export MAKEFLAGS="%{?jobs:-j %jobs}"
echo yes | ./configure %common_options -webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql
%check_config
make %{?jobs:-j%jobs} sub-src
make %{?jobs:-j%jobs} -C tools/assistant
make %{?jobs:-j%jobs} -C demos
make %{?jobs:-j%jobs} -C examples
%install
export QTDIR=$PWD
make INSTALL_ROOT=$RPM_BUILD_ROOT -C tools/assistant install
make INSTALL_ROOT=$RPM_BUILD_ROOT -C demos install
make INSTALL_ROOT=$RPM_BUILD_ROOT -C examples install
mv $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer $RPM_BUILD_ROOT/%_bindir
mv $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser $RPM_BUILD_ROOT/%_bindir/qt4-browser
ln -s %_bindir/svgviewer $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer
ln -s %_bindir/qt4-browser $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser
# reduce fileconflicts
for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do
test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f
done
find $RPM_BUILD_ROOT -type d -print0 | xargs -0 --no-run-if-empty rmdir --ignore-fail-on-non-empty
# argggh, qmake is such a piece of <censored>
mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \;
# fix more qmake errors
mkdir -p $RPM_BUILD_ROOT/%_libdir/qt
find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \;
find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L/usr/src/packages/BUILD/\S+,,g' {} \;
mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/
ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos
ln -s %_libdir/qt4/examples $RPM_BUILD_ROOT/%_docdir/%base_name/examples
# packaged in %name-devel-doc-data
rm -rf $RPM_BUILD_ROOT/%_docdir/%base_name/{doc,html}
rm -f $RPM_BUILD_ROOT/%_libdir/libQt{3,A,C,G,H,N,S,T}*
rm -f $RPM_BUILD_ROOT/%_libdir/libQtXml.*
rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/plugins
%if %suse_version > 1020
%fdupes $RPM_BUILD_ROOT/usr/include
%endif
%suse_update_desktop_file -i assistant4 Qt Development Documentation
%clean
rm -rf $RPM_BUILD_ROOT
# no baselibs supplements for older distros
%if %suse_version < 1110
sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf
%endif
%files
%defattr(-,root,root,755)
/usr/bin/assistant
/usr/bin/assistant_adp
/usr/bin/qhelpgenerator
/usr/bin/qhelpconverter
/usr/bin/qcollectiongenerator
/usr/bin/qtdemo
/usr/share/applications/assistant4.desktop
/usr/share/pixmaps/assistant.png
#/usr/share/qt4/translations/assistant_*.qm
/usr/%_lib/qt4/demos
%dir %_docdir/%base_name
%_docdir/%base_name/demos
%_docdir/%base_name/examples
%_libdir/qt4/examples
%files -n qt4-x11-tools
%defattr(-,root,root,755)
/usr/bin/svgviewer
/usr/bin/qt4-browser
%changelog
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100
+++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libqt4-sql-plugins (Version 4.5.3)
+# spec file for package libqt4-sql-plugins (Version 4.6.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,6 +26,15 @@
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
+# COMMON-VERSION-BEGIN
+# COMMON-VERSION-BEGIN
+Version: 4.6.0
+Release: 1
+%define base_name libqt4
+%define x11_free -everywhere-opensource-src-
+%define rversion 4.6.0
+# COMMON-VERSION-END
+# COMMON-VERSION-END
Url: http://www.trolltech.com
License: QPL, GPL
Group: System/Libraries
@@ -33,11 +42,6 @@
Summary: Qt 4 SQL related libraries
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 4.5.3
-Release: 4
-%define base_name libqt4
-%define x11_free -x11-opensource-src-
-%define rversion 4.5.3
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
@@ -54,30 +58,20 @@
Patch39: 0191-listview-alternate-row-colors.diff
Patch40: 0188-fix-moc-parser-same-name-header.diff
Patch43: 0195-compositing-properties.diff
-Patch55: ignore-global-advance-width-in-fots.diff
+Patch55: ignore-global-advance-width-in-fonts.diff
Patch60: 0180-window-role.diff
Patch61: qt4-fake-bold.patch
Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch
Patch75: qt-debug-timer.diff
Patch87: qfatal-noreturn.diff
-Patch90: display-key-support.diff
Patch101: no-moc-date.diff
Patch102: 0253-qmake_correct_path_separators.diff
-Patch105: disable-callgrind.diff
Patch106: build-install-qdoc3.diff
-Patch108: 0280-deserialization-custom-dbus-properties.diff
-Patch111: 0283-do-not-deduce-scrollbar-extent-twice.diff
-Patch113: 0019-Make-QMenu-respect-the-minimum-width-set.patch
-Patch114: avoid-dbus-deadlock.diff
-Patch116: fix-xsync-flag.diff
-Patch117: glib-eventloop-regression.diff
-Patch118: filter-leak-fix.patch
+Patch107: webkit-ia64_s390x.patch
+Patch108: minimal-toc-for-webkit.diff
+Patch109: libqt4-libtool-nodate.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if %suse_version > 910
- %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -xsync
-%else
- %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -no-xrender -no-xrandr -no-xinerama -no-xshape -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -no-exceptions -system-libtiff -no-sm -no-opengl -no-xcursor -no-webkit -no-xmlpatterns
-%endif
+ %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
%define check_config \
grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \
if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \
@@ -113,25 +107,17 @@
%patch43
%patch55
%patch60
-%if %suse_version > 910
# bnc#374073 comment #8
# %patch61
-%endif
%patch70
%patch75
%patch87
-%patch90
%patch101
%patch102
-%patch105
%patch106
+%patch107
%patch108
-%patch111
-%patch113 -p1
-%patch114 -p1
-%patch116
-%patch117 -p1
-%patch118
+%patch109
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
++++++ libqt4.spec ++++++
++++ 623 lines (skipped)
++++ between libqt4/libqt4.spec
++++ and libqt4/libqt4.spec
++++++ 0180-window-role.diff ++++++
--- /var/tmp/diff_new_pack.MJKLd7/_old 2009-12-17 16:45:27.000000000 +0100
+++ /var/tmp/diff_new_pack.MJKLd7/_new 2009-12-17 16:45:27.000000000 +0100
@@ -1,22 +1,24 @@
-qt-bugs@ issue : 167704
-Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
-bugs.kde.org number : none
-applied: no
-author: Lubos Lunak