commit libqt4 for openSUSE:Factory

3 Sep 2010

Hello community,

here is the log from the commit of package libqt4 for openSUSE:Factory
checked in at Fri Sep 3 13:41:45 CEST 2010.



--------

--- libqt4/libqt4.changes	2010-08-03 16:25:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes	2010-09-01 15:33:02.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Sep  1 15:31:54 CEST 2010 - dmueller@suse.de
+
+- update to 4.7.0 RC1:
+  - Qt 4.7 introduces many new features and improvements as well as bugfixes
+  over the 4.6.x series. For more details, refer to the online documentation
+  included in this distribution. The documentation is also available online:
+
+  http://qt.nokia.com/doc/4.7
+
+  A detailed list of code fixes since previous 4.7.0 Beta
+  can be found in the included changes-4.7.0 file.
+
+-------------------------------------------------------------------
libqt4-devel-doc.changes: same change
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change

calling whatdependson for head-i586


Old:
----
  bnc610578.diff
  qgtkstyle-no-gtk-crash.diff
  qt-everywhere-opensource-src-4.6.3.tar.bz2
  qtwebkit-initialize-gtk.diff
  SSL-error-endless-loop.diff

New:
----
  qt-everywhere-opensource-src-4.7.0-rc1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.ryQzBw/_old	2010-09-03 13:38:58.000000000 +0200
+++ /var/tmp/diff_new_pack.ryQzBw/_new	2010-09-03 13:38:58.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package libqt4-devel-doc-data (Version 4.6.3)
+# spec file for package libqt4-devel-doc-data (Version 4.6.95+4.7.0rc1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -27,11 +27,11 @@
 %endif
 # COMMON-VERSION-BEGIN
 # COMMON-VERSION-BEGIN
-Version:        4.6.3
-Release:        5
+Version:        4.6.95+4.7.0rc1
+Release:        1
 %define base_name libqt4
 %define x11_free  -everywhere-opensource-src-
-%define rversion 4.6.3
+%define rversion 4.7.0-rc1
 # COMMON-VERSION-END
 # COMMON-VERSION-END
 Url:            http://www.trolltech.com
@@ -75,16 +75,12 @@
 Patch108:       minimal-toc-for-webkit.diff
 Patch109:       libqt4-libtool-nodate.diff
 Patch113:       ppc64-webkit-link-fix.diff
-Patch115:       qgtkstyle-no-gtk-crash.diff
-Patch117:       bnc610578.diff
 Patch118:       rcc-stable-dirlisting.diff
 Patch119:       hppa_ldcw_fix.diff
 Patch120:       hppa_unaligned_access_fix_458133.diff
 Patch121:       webkit-sparc64.diff
-Patch122:       SSL-error-endless-loop.diff
-Patch123:       qtwebkit-initialize-gtk.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 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 -importdir %plugindir/imports  -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                                 \
@@ -119,29 +115,32 @@
 %patch40
 %patch41
 %patch43
-%patch55
-%patch60
+# ### 47 rediff
+#%patch55
+# ### 47 rediff
+# %patch60
 # bnc#374073 comment #8
 # %patch61
 %patch70
 %patch75
 %patch87
 %patch101
-%patch102
-%patch107
-%patch108
+# ### 47 rediff
+# %patch102
+# ### 47 rediff
+# %patch107
+# ### 47 rediff
+#%patch108
 %patch109
-%patch113
-%patch115
-%patch117 -p1
+# ### 47 rediff
+#%patch113
 %patch118 -p1
 %ifarch hppa
 %patch119
 %patch120
 %endif
-%patch121 -p1
-%patch122 -p1
-%patch123
+# ### 47 rediff
+#%patch121 -p1
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts}
 # COMMON-END

libqt4-devel-doc.spec: same change
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.ryQzBw/_old	2010-09-03 13:38:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ryQzBw/_new	2010-09-03 13:38:59.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package libqt4 (Version 4.6.3)
+# spec file for package libqt4 (Version 4.6.95+4.7.0rc1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,7 +20,7 @@
 
 Name:           libqt4
 BuildRequires:  Mesa-devel cups-devel freetype2-devel gcc-c++ libjpeg-devel libmng-devel
-BuildRequires:  libpng-devel libtiff-devel pkgconfig sqlite-devel
+BuildRequires:  libpng-devel libtiff-devel pkgconfig sqlite3-devel
 BuildRequires:  fdupes glib2-devel update-desktop-files
 BuildRequires:  dbus-1-devel openssl-devel xorg-x11-devel
 BuildRequires:  alsa-devel gtk2-devel
@@ -53,11 +53,11 @@
 Provides:       libqt4-dbus-1 = 4.4.0
 Obsoletes:      libqt4-dbus-1 < 4.4.0
 # COMMON-VERSION-BEGIN
-Version:        4.6.3
-Release:        5
+Version:        4.6.95+4.7.0rc1
+Release:        1
 %define base_name libqt4
 %define x11_free  -everywhere-opensource-src-
-%define rversion 4.6.3
+%define rversion 4.7.0-rc1
 # COMMON-VERSION-END
 # COMMON-BEGIN
 Source:         qt%x11_free%rversion.tar.bz2
@@ -92,16 +92,12 @@
 Patch108:       minimal-toc-for-webkit.diff
 Patch109:       libqt4-libtool-nodate.diff
 Patch113:       ppc64-webkit-link-fix.diff
-Patch115:       qgtkstyle-no-gtk-crash.diff
-Patch117:       bnc610578.diff
 Patch118:       rcc-stable-dirlisting.diff
 Patch119:       hppa_ldcw_fix.diff
 Patch120:       hppa_unaligned_access_fix_458133.diff
 Patch121:       webkit-sparc64.diff
-Patch122:       SSL-error-endless-loop.diff
-Patch123:       qtwebkit-initialize-gtk.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 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 -importdir %plugindir/imports  -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                                 \
@@ -136,29 +132,32 @@
 %patch40
 %patch41
 %patch43
-%patch55
-%patch60
+# ### 47 rediff
+#%patch55
+# ### 47 rediff
+# %patch60
 # bnc#374073 comment #8
 # %patch61
 %patch70
 %patch75
 %patch87
 %patch101
-%patch102
-%patch107
-%patch108
+# ### 47 rediff
+# %patch102
+# ### 47 rediff
+# %patch107
+# ### 47 rediff
+#%patch108
 %patch109
-%patch113
-%patch115
-%patch117 -p1
+# ### 47 rediff
+#%patch113
 %patch118 -p1
 %ifarch hppa
 %patch119
 %patch120
 %endif
-%patch121 -p1
-%patch122 -p1
-%patch123
+# ### 47 rediff
+#%patch121 -p1
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts}
 # COMMON-END
@@ -170,7 +169,7 @@
 Requires:       zlib-devel c++_compiler pkgconfig
 Requires:       freetype2-devel libmng-devel libpng-devel libtiff-devel
 Requires:       xorg-x11-devel Mesa-devel dbus-1-devel openssl-devel
-Requires:       glib2-devel sqlite-devel
+Requires:       glib2-devel sqlite3-devel
 Requires:       %name = %version
 Requires:       libqt4-sql-sqlite >= %version
 # bug437293
@@ -299,6 +298,8 @@
 Group:          Development/Libraries/C and C++
 Summary:        Open source Web Browser engine based on Qt4
 Requires:       libqt4-x11 = %version
+Provides:       libQtDeclarative4 = 4.6.0
+Obsoletes:      libQtDeclarative4 <= 4.6.0
 
 %description -n libQtWebKit4
 WebKit is an open source web browser engine. WebKit's HTML and JavaScript
@@ -320,6 +321,8 @@
 Summary:        Open source Web Browser engine based on Qt4
 Requires:       libQtWebKit4 = %version
 Requires:       libqt4-devel = %version
+Provides:       libQtDeclarative-devel = 4.6.0
+Obsoletes:      libQtDeclarative-devel <= 4.6.0
 
 %description -n libQtWebKit-devel
 WebKit is an open source web browser engine. WebKit's HTML and JavaScript
@@ -482,7 +485,7 @@
 #install qdoc3
 install -m 755 bin/qdoc3 $RPM_BUILD_ROOT/usr/bin/
 # packaged in devel-doc
-rm $RPM_BUILD_ROOT/usr/bin/{qcollectiongenerator,assistant,assistant_adp}
+rm $RPM_BUILD_ROOT/usr/bin/{qcollectiongenerator,assistant}
 # some packages expect these symlinks
 ln -s /usr/include $RPM_BUILD_ROOT/%_libdir/qt4/include
 ln -s %_libdir $RPM_BUILD_ROOT/%_libdir/qt4/lib
@@ -561,6 +564,7 @@
 /usr/bin/qtconfig
 %endif
 /usr/bin/qdbusviewer
+/usr/bin/qmlviewer
 /usr/share/applications/qt4config.desktop
 # designer.png is referenced by qt4config.desktop
 /usr/share/pixmaps/designer.png
@@ -570,7 +574,6 @@
 %_libdir/libQtScript.so.*
 %_libdir/libQtScriptTools.so.*
 %_libdir/libQtDesigner*.so.*
-%_libdir/libQtAssistantClient.so.*
 %_libdir/libQtHelp.so.*
 %_libdir/libQtMultimedia.so.*
 %dir %plugindir/iconengines
@@ -578,11 +581,15 @@
 %dir %plugindir/inputmethods
 %dir %plugindir/accessible
 %dir %plugindir/graphicssystems
+%dir %plugindir/bearer
+%dir %plugindir/imports
 %plugindir/iconengines/*
 %plugindir/imageformats/*
 %plugindir/inputmethods/*
 %plugindir/accessible/*
 %plugindir/graphicssystems/*
+%plugindir/bearer/*
+%plugindir/imports/*
 /usr/share/qt4/phrasebooks
 /usr/share/qt4/translations/qtconfig_*.qm
 %plugindir/script/libqtscriptdbus.so
@@ -600,31 +607,41 @@
 /usr/bin/xmlpatternsvalidator
 %_libdir/libQtWebKit.so.*
 %_libdir/libQtXmlPatterns.so.*
+%_libdir/libQtDeclarative.so.*
 
 %files -n libQtWebKit-devel
 %defattr(-,root,root,755)
 /usr/include/QtWebKit
 /usr/include/QtXmlPatterns
+/usr/include/QtDeclarative
 %_libdir/libQtXmlPatterns.so
 %_libdir/libQtXmlPatterns.prl
 %_libdir/libQtXmlPatterns.la
 %_libdir/libQtWebKit.so
 %_libdir/libQtWebKit.prl
 %_libdir/libQtWebKit.la
+%_libdir/libQtDeclarative.so
+%_libdir/libQtDeclarative.prl
+%_libdir/libQtDeclarative.la
 %_libdir/pkgconfig/QtWebKit.pc
 %_libdir/pkgconfig/QtXmlPatterns.pc
+%_libdir/pkgconfig/QtDeclarative.pc
 
 %files devel
 %defattr(-,root,root,755)
 %exclude %_libdir/libQtWebKit.la
 %exclude %_libdir/libQtWebKit.prl
 %exclude %_libdir/libQtWebKit.so
+%exclude %_libdir/libQtDeclarative.so
+%exclude %_libdir/libQtDeclarative.prl
+%exclude %_libdir/libQtDeclarative.la
 %exclude %_libdir/libQtXmlPatterns.la
 %exclude %_libdir/libQtXmlPatterns.prl
 %exclude %_libdir/libQtXmlPatterns.prl
 %exclude %_libdir/libQtXmlPatterns.so
 %exclude %_libdir/pkgconfig/QtWebKit.pc
 %exclude %_libdir/pkgconfig/QtXmlPatterns.pc
+%exclude %_libdir/pkgconfig/QtDeclarative.pc
 /usr/bin/rcc
 /usr/bin/uic
 %if %with_qt3support
@@ -655,7 +672,6 @@
 %plugindir/designer
 /usr/include/Qt3Support
 %endif
-/usr/include/QtAssistant
 /usr/include/QtCore
 /usr/include/QtDBus
 /usr/include/QtDesigner

++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.ryQzBw/_old	2010-09-03 13:38:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ryQzBw/_new	2010-09-03 13:38:59.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package libqt4-sql-plugins (Version 4.6.3)
+# spec file for package libqt4-sql-plugins (Version 4.6.95+4.7.0rc1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -28,11 +28,11 @@
 %endif
 # COMMON-VERSION-BEGIN
 # COMMON-VERSION-BEGIN
-Version:        4.6.3
-Release:        5
+Version:        4.6.95+4.7.0rc1
+Release:        1
 %define base_name libqt4
 %define x11_free  -everywhere-opensource-src-
-%define rversion 4.6.3
+%define rversion 4.7.0-rc1
 # COMMON-VERSION-END
 # COMMON-VERSION-END
 Url:            http://www.trolltech.com
@@ -74,16 +74,12 @@
 Patch108:       minimal-toc-for-webkit.diff
 Patch109:       libqt4-libtool-nodate.diff
 Patch113:       ppc64-webkit-link-fix.diff
-Patch115:       qgtkstyle-no-gtk-crash.diff
-Patch117:       bnc610578.diff
 Patch118:       rcc-stable-dirlisting.diff
 Patch119:       hppa_ldcw_fix.diff
 Patch120:       hppa_unaligned_access_fix_458133.diff
 Patch121:       webkit-sparc64.diff
-Patch122:       SSL-error-endless-loop.diff
-Patch123:       qtwebkit-initialize-gtk.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 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 -importdir %plugindir/imports  -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                                 \
@@ -118,29 +114,32 @@
 %patch40
 %patch41
 %patch43
-%patch55
-%patch60
+# ### 47 rediff
+#%patch55
+# ### 47 rediff
+# %patch60
 # bnc#374073 comment #8
 # %patch61
 %patch70
 %patch75
 %patch87
 %patch101
-%patch102
-%patch107
-%patch108
+# ### 47 rediff
+# %patch102
+# ### 47 rediff
+# %patch107
+# ### 47 rediff
+#%patch108
 %patch109
-%patch113
-%patch115
-%patch117 -p1
+# ### 47 rediff
+#%patch113
 %patch118 -p1
 %ifarch hppa
 %patch119
 %patch120
 %endif
-%patch121 -p1
-%patch122 -p1
-%patch123
+# ### 47 rediff
+#%patch121 -p1
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts}
 # COMMON-END





++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)