Hello community,

here is the log from the commit of package libqt4 for openSUSE:12.1:Update:Test 
checked in at 2012-01-10 15:02:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/libqt4 (Old)
 and      /work/SRC/openSUSE:12.1:Update:Test/.libqt4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libqt4", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:12.1:Update:Test/libqt4/libqt4-devel-doc.changes 
2011-12-05 17:56:49.000000000 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.libqt4.new/libqt4-devel-doc.changes    
2012-01-10 15:02:12.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Jan  6 17:06:22 CET 2012 - [email protected]
+
+- add patch for rare stack based overflow in harbuzz parser
+  (bnc#739904, CVE-2011-3922).
+
+-------------------------------------------------------------------
+Wed Dec 14 00:26:42 CET 2011 - [email protected]
+
+- fix license to SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0 (bnc#736425)
+
+-------------------------------------------------------------------
libqt4-sql-plugins.changes: same change
libqt4.changes: same change

New:
----
  CVE-2011-3922.diff

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

Other differences:
------------------
++++++ libqt4-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.IJ2qbQ/_old  2012-01-10 15:02:16.000000000 +0100
+++ /var/tmp/diff_new_pack.IJ2qbQ/_new  2012-01-10 15:02:16.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package libqt4-devel-doc
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -14,14 +14,18 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
-# norootforbuild
 # nodebuginfo
 
 
 Name:           libqt4-devel-doc
-BuildRequires:  Mesa-devel cups-devel freeglut-devel libjpeg-devel libpng-devel
-BuildRequires:  alsa-devel gtk2-devel sqlite3-devel
+BuildRequires:  Mesa-devel
+BuildRequires:  alsa-devel
+BuildRequires:  cups-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  sqlite3-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
 %endif
@@ -31,16 +35,17 @@
 # COMMON-VERSION-BEGIN
 # COMMON-VERSION-BEGIN
 Version:        4.7.4
-Release:        1
+Release:        0
 %define base_name libqt4
 %define tar_version everywhere-opensource-src-%{version}
 # COMMON-VERSION-END
 # COMMON-VERSION-END
-BuildRequires:  libQtWebKit-devel >= %version libqt4-devel >= %version
+BuildRequires:  libQtWebKit-devel >= %version
+BuildRequires:  libqt4-devel >= %version
 Url:            http://www.trolltech.com
-License:        QPL, GPL
-Group:          Documentation/HTML
 Summary:        Qt documentation
+License:        SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0
+Group:          Documentation/HTML
 Requires:       libqt4 = %version
 Requires:       libqt4-devel-doc-data = %version
 Requires:       libqt4-sql-sqlite >= %version
@@ -89,7 +94,8 @@
 Patch129:       blacklist-diginotar-certs.diff
 Patch130:       fix-arm-assembler-for-thumb2.diff
 Patch131:       disable-im-for-password.diff
-Patch132:       x11-init-threads.diff
+Patch132:       CVE-2011-3922.diff
+Patch133:       x11-init-threads.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 -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
@@ -146,6 +152,7 @@
 %patch130
 %patch131 -p1
 %patch132
+%patch133
 # ### 47 rediff
 #%patch121 -p1
 # be sure not to use them
@@ -154,9 +161,8 @@
 # COMMON-END
 
 %package -n qt4-x11-tools
-License:        QPL, GPL
-Group:          System/Libraries
 Summary:        C++ Program Library, Core Components
+Group:          System/Libraries
 Requires:       libqt4-x11 >= %version
 
 %description -n qt4-x11-tools
@@ -166,12 +172,11 @@
 handling.
 
 %package data
-License:        QPL, GPL
-Group:          System/Libraries
 %if %suse_version > 1110
 BuildArch:      noarch
 %endif
 Summary:        C++ Program Library, Core Components
+Group:          System/Libraries
 Requires:       %name = %version
 
 %description data

++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.IJ2qbQ/_old  2012-01-10 15:02:16.000000000 +0100
+++ /var/tmp/diff_new_pack.IJ2qbQ/_new  2012-01-10 15:02:16.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package libqt4-sql-plugins
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -14,32 +14,34 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
-# norootforbuild
 # nodebuginfo
 
 
 Name:           libqt4-sql-plugins
+BuildRequires:  Mesa-devel
+BuildRequires:  alsa-devel
 BuildRequires:  cups-devel
-BuildRequires:  libmysqlclient-devel pkgconfig postgresql-devel unixODBC-devel
-BuildRequires:  Mesa-devel alsa-devel gtk2-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  libmysqlclient-devel
+BuildRequires:  pkgconfig
+BuildRequires:  postgresql-devel
+BuildRequires:  unixODBC-devel
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif
 # COMMON-VERSION-BEGIN
 # COMMON-VERSION-BEGIN
 Version:        4.7.4
-Release:        1
+Release:        0
 %define base_name libqt4
 %define tar_version everywhere-opensource-src-%{version}
 # COMMON-VERSION-END
 # COMMON-VERSION-END
 BuildRequires:  libqt4-devel >= %version
 Url:            http://www.trolltech.com
-License:        QPL, GPL
-Group:          System/Libraries
-AutoReqProv:    on
 Summary:        Qt 4 SQL related libraries
+License:        SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0
+Group:          System/Libraries
 # COMMON-BEGIN
 # COMMON-BEGIN
 Source:         qt-%tar_version.tar.bz2
@@ -81,7 +83,8 @@
 Patch129:       blacklist-diginotar-certs.diff
 Patch130:       fix-arm-assembler-for-thumb2.diff
 Patch131:       disable-im-for-password.diff
-Patch132:       x11-init-threads.diff
+Patch132:       CVE-2011-3922.diff
+Patch133:       x11-init-threads.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 -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
@@ -138,6 +141,7 @@
 %patch130
 %patch131 -p1
 %patch132
+%patch133
 # ### 47 rediff
 #%patch121 -p1
 # be sure not to use them
@@ -146,9 +150,8 @@
 # COMMON-END
 
 %package -n libqt4-sql-unixODBC
-License:        QPL, GPL
-Group:          Development/Libraries/C and C++
 Summary:        Qt 4 unixODBC plugin
+Group:          Development/Libraries/C and C++
 Requires:       libqt4-sql = %version
 Provides:       libqt4_sql_backend  = %version
 Obsoletes:      qt-sql-unixODBC < 4.6.0
@@ -158,16 +161,9 @@
 Qt unixODBC plugin to support databases via unixODBC within Qt
 applications.
 
-
-
-Authors:
---------
-    Troll Tech AS, Norway
-
 %package -n libqt4-sql-postgresql
-License:        QPL, GPL
-Group:          Development/Libraries/C and C++
 Summary:        Qt 4 PostgreSQL plugin
+Group:          Development/Libraries/C and C++
 Requires:       libqt4-sql = %version
 Provides:       libqt4_sql_backend  = %version
 Obsoletes:      qt-sql-postgresql < 4.6.0
@@ -176,16 +172,9 @@
 %description -n libqt4-sql-postgresql
 Qt SQL plugin to support PostgreSQL servers in Qt applications.
 
-
-
-Authors:
---------
-    Troll Tech AS, Norway
-
 %package -n libqt4-sql-mysql
-License:        QPL, GPL
-Group:          Development/Libraries/C and C++
 Summary:        Qt 4 MySQL support
+Group:          Development/Libraries/C and C++
 Requires:       libqt4-sql = %version
 Provides:       libqt4_sql_backend  = %version
 Obsoletes:      qt-sql-mysql < 4.6.0
@@ -194,12 +183,6 @@
 %description -n libqt4-sql-mysql
 A plugin to support MySQL server in Qt applications.
 
-
-
-Authors:
---------
-    Troll Tech AS, Norway
-
 %build
 export QTDIR=$PWD
 export PATH=$PWD/bin:$PATH

++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.IJ2qbQ/_old  2012-01-10 15:02:16.000000000 +0100
+++ /var/tmp/diff_new_pack.IJ2qbQ/_new  2012-01-10 15:02:16.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package libqt4
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,15 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           libqt4
-BuildRequires:  Mesa-devel cups-devel freetype2-devel gcc-c++ libjpeg-devel 
libmng-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
+BuildRequires:  Mesa-devel
+BuildRequires:  alsa-devel
+BuildRequires:  cups-devel
+BuildRequires:  dbus-1-devel
+BuildRequires:  fdupes
+BuildRequires:  freetype2-devel
+BuildRequires:  gcc-c++
+BuildRequires:  glib2-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libmng-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
+BuildRequires:  sqlite3-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  xorg-x11-devel
 %if %suse_version > 1020
 BuildRequires:  clucene-core-devel
 %endif
@@ -33,14 +44,14 @@
 %define with_qtwebkit 0
 %if %with_phonon
 %if %with_phonon_backend
-BuildRequires:  gstreamer-0_10-plugins-base-devel libxine-devel
+BuildRequires:  gstreamer-0_10-plugins-base-devel
+BuildRequires:  libxine-devel
 %endif
 %endif
 Url:            http://www.qtsoftware.com
-License:        GPLv3 ; LGPLv2.1+
-Group:          System/Libraries
-AutoReqProv:    on
 Summary:        C++ Program Library, Core Components
+License:        GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1
+Group:          System/Libraries
 # bug437293
 %ifarch ppc64
 Obsoletes:      qt-64bit
@@ -55,7 +66,7 @@
 Obsoletes:      libqt4-dbus-1 < 4.4.0
 # COMMON-VERSION-BEGIN
 Version:        4.7.4
-Release:        1
+Release:        0
 %define base_name libqt4
 %define tar_version everywhere-opensource-src-%{version}
 # COMMON-VERSION-END
@@ -99,7 +110,8 @@
 Patch129:       blacklist-diginotar-certs.diff
 Patch130:       fix-arm-assembler-for-thumb2.diff
 Patch131:       disable-im-for-password.diff
-Patch132:       x11-init-threads.diff
+Patch132:       CVE-2011-3922.diff
+Patch133:       x11-init-threads.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 -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
@@ -156,6 +168,7 @@
 %patch130
 %patch131 -p1
 %patch132
+%patch133
 # ### 47 rediff
 #%patch121 -p1
 # be sure not to use them
@@ -163,9 +176,9 @@
 # COMMON-END
 
 %package devel
-License:        GPLv2 ; GPLv3
-Group:          Development/Libraries/X11
 Summary:        Qt Development Kit
+License:        GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1
+Group:          Development/Libraries/X11
 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
@@ -197,9 +210,9 @@
 
 
 %package -n libqt4-sql-sqlite
-License:        GPLv2 ; GPLv3
-Group:          Development/Libraries/C and C++
 Summary:        Qt 4 sqlite plugin
+License:        GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1
+Group:          Development/Libraries/C and C++
 Requires:       libqt4-sql = %version
 Provides:       libqt4_sql_backend = %version
 Obsoletes:      qt-sql-sqlite < 4.4.0
@@ -212,9 +225,9 @@
 
 
 %package x11
-License:        GPLv2 ; GPLv3
-Group:          Development/Libraries/C and C++
 Summary:        Qt 4 GUI related libraries
+License:        GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1
+Group:          Development/Libraries/C and C++
 # bug437293
 %ifarch ppc64
 Obsoletes:      qt-x11-64bit
@@ -232,9 +245,9 @@
 %if %with_qt3support
 
 %package qt3support
-License:        GPLv2 ; GPLv3
-Group:          System/Libraries
 Summary:        C++ Program Library, Core Components
+License:        GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1
+Group:          System/Libraries
 # bug437293
 %ifarch ppc64
 Obsoletes:      qt-qt3support-64bit
@@ -254,9 +267,9 @@
 %endif
 
 %package sql
-License:        GPLv2 ; GPLv3
-Group:          Development/Libraries/C and C++
 Summary:        Qt 4 SQL related libraries
+License:        GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1
+Group:          Development/Libraries/C and C++
 # bug437293
 %ifarch ppc64
 Obsoletes:      qt-sql-64bit
@@ -275,9 +288,9 @@
 %if %with_qtwebkit
 
 %package -n libQtWebKit4
-License:        GPLv2 ; GPLv3
-Group:          Development/Libraries/C and C++
 Summary:        Open source Web Browser engine based on Qt4
+License:        GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1
+Group:          Development/Libraries/C and C++
 Requires:       libqt4-x11 = %version
 Provides:       libQtDeclarative4 = 4.6.0
 Obsoletes:      libQtDeclarative4 < 4.6.0
@@ -291,9 +304,9 @@
 
 
 %package -n libQtWebKit-devel
-License:        GPLv2 ; GPLv3
-Group:          Development/Libraries/C and C++
 Summary:        Open source Web Browser engine based on Qt4
+License:        GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1
+Group:          Development/Libraries/C and C++
 Requires:       libQtWebKit4 = %version
 Requires:       libqt4-devel = %version
 
@@ -307,9 +320,9 @@
 %endif
 
 %package private-headers-devel
-License:        GPLv2 ; GPLv3
-Group:          Development/Libraries/C and C++
 Summary:        Non-ABI stabile experimental API
+License:        GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1
+Group:          Development/Libraries/C and C++
 Requires:       libqt4-x11 = %version libqt4-devel = %version
 
 %description private-headers-devel
@@ -322,8 +335,8 @@
 
 %package -n phonon
 
-License:        LGPLv2.0+
 Summary:        Phonon Multimedia Platform Abstraction
+License:        LGPL-2.0+
 Group:          Development/Libraries/KDE
 Requires:       phonon-backend = %version
 Requires:       libphonon4 = %version
@@ -337,8 +350,8 @@
 
 %package -n phonon-devel
 
-License:        LGPLv2.0+
 Summary:        Phonon Multimedia Platform Abstraction
+License:        LGPL-2.0+
 Group:          Development/Libraries/KDE
 Requires:       %name = %version
 Requires:       libphonon4 = %version
@@ -353,8 +366,8 @@
 
 %package -n libphonon4
 
-License:        LGPLv2.0+
 Summary:        Phonon Multimedia Platform Abstraction
+License:        LGPL-2.0+
 Group:          Development/Libraries/KDE
 %requires_ge    libqt4-x11
 
@@ -370,8 +383,8 @@
 
 %package -n phonon-backend-gstreamer-0_10
 
-License:        LGPLv2.0+
 Summary:        Phonon Multimedia Platform Abstraction
+License:        LGPL-2.0+
 Group:          Development/Libraries/KDE
 Provides:       phonon-backend = %version
 Requires:       libphonon4 = %version
@@ -385,8 +398,8 @@
 
 %package -n phonon-backend-xine
 
-License:        LGPLv2.0+
 Summary:        Phonon Multimedia Platform Abstraction
+License:        LGPL-2.0+
 Group:          Development/Libraries/KDE
 Provides:       phonon-backend = %version
 Requires:       libphonon4 = %version

++++++ CVE-2011-3922.diff ++++++
--- src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c
+++ src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c
@@ -359,7 +359,8 @@
         if (kinzi >= 0 && i > base && (cc & Mymr_CF_AFTER_KINZI)) {
             reordered[len] = Mymr_C_NGA;
             reordered[len+1] = Mymr_C_VIRAMA;
-            properties[len-1] = AboveForm;
+            if (len > 0)
+                properties[len-1] = AboveForm;
             properties[len] = AboveForm;
             len += 2;
             kinzi = -1;


++++++ libqt4-devel-doc.spec.in ++++++
--- /var/tmp/diff_new_pack.IJ2qbQ/_old  2012-01-10 15:02:16.000000000 +0100
+++ /var/tmp/diff_new_pack.IJ2qbQ/_new  2012-01-10 15:02:16.000000000 +0100
@@ -14,13 +14,18 @@
 
 # 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 Mesa-devel
-BuildRequires:  alsa-devel gtk2-devel sqlite3-devel
+BuildRequires:  Mesa-devel
+BuildRequires:  alsa-devel
+BuildRequires:  cups-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  sqlite3-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
 %endif
@@ -29,11 +34,12 @@
 %endif
 # COMMON-VERSION-BEGIN
 # COMMON-VERSION-END
-BuildRequires:  libQtWebKit-devel >= %version libqt4-devel >= %version
+BuildRequires:  libQtWebKit-devel >= %version
+BuildRequires:  libqt4-devel >= %version
 Url:            http://www.trolltech.com
-License:        QPL, GPL
-Group:          Documentation/HTML
 Summary:        Qt documentation
+License:        SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0
+Group:          Documentation/HTML
 Requires:       libqt4 = %version
 Requires:       libqt4-devel-doc-data = %version
 Requires:       libqt4-sql-sqlite >= %version
@@ -45,9 +51,8 @@
 # COMMON-END
 
 %package -n qt4-x11-tools
-License:        QPL, GPL
-Group:          System/Libraries
 Summary:        C++ Program Library, Core Components
+Group:          System/Libraries
 Requires:       libqt4-x11 >= %version
 
 %description -n qt4-x11-tools
@@ -57,12 +62,11 @@
 handling.
 
 %package data
-License:        QPL, GPL
-Group:          System/Libraries
 %if %suse_version > 1110
 BuildArch:      noarch
 %endif
 Summary:        C++ Program Library, Core Components
+Group:          System/Libraries
 Requires:       %name = %version
 
 %description data
@@ -192,5 +196,4 @@
 /usr/share/doc/packages/%base_name/html*
 /usr/share/doc/packages/%base_name/src
 
-
 %changelog

++++++ libqt4-sql-plugins.spec.in ++++++
--- /var/tmp/diff_new_pack.IJ2qbQ/_old  2012-01-10 15:02:16.000000000 +0100
+++ /var/tmp/diff_new_pack.IJ2qbQ/_new  2012-01-10 15:02:16.000000000 +0100
@@ -14,14 +14,18 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
-# norootforbuild
 # nodebuginfo
 
+
 Name:           libqt4-sql-plugins
+BuildRequires:  Mesa-devel
+BuildRequires:  alsa-devel
 BuildRequires:  cups-devel
-BuildRequires:  libmysqlclient-devel pkgconfig postgresql-devel unixODBC-devel
-BuildRequires:  alsa-devel gtk2-devel Mesa-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  libmysqlclient-devel
+BuildRequires:  pkgconfig
+BuildRequires:  postgresql-devel
+BuildRequires:  unixODBC-devel
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif
@@ -29,17 +33,15 @@
 # COMMON-VERSION-END
 BuildRequires:  libqt4-devel >= %version
 Url:            http://www.trolltech.com
-License:        QPL, GPL
-Group:          System/Libraries
-AutoReqProv:    on
 Summary:        Qt 4 SQL related libraries
+License:        SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0
+Group:          System/Libraries
 # COMMON-BEGIN
 # COMMON-END
 
 %package -n libqt4-sql-unixODBC
-License:        QPL, GPL
-Group:          Development/Libraries/C and C++
 Summary:        Qt 4 unixODBC plugin
+Group:          Development/Libraries/C and C++
 Requires:       libqt4-sql = %version
 Provides:       libqt4_sql_backend  = %version
 Obsoletes:      qt-sql-unixODBC < 4.6.0
@@ -49,16 +51,9 @@
 Qt unixODBC plugin to support databases via unixODBC within Qt
 applications.
 
-
-
-Authors:
---------
-    Troll Tech AS, Norway
-
 %package -n libqt4-sql-postgresql
-License:        QPL, GPL
-Group:          Development/Libraries/C and C++
 Summary:        Qt 4 PostgreSQL plugin
+Group:          Development/Libraries/C and C++
 Requires:       libqt4-sql = %version
 Provides:       libqt4_sql_backend  = %version
 Obsoletes:      qt-sql-postgresql < 4.6.0
@@ -67,16 +62,9 @@
 %description -n libqt4-sql-postgresql
 Qt SQL plugin to support PostgreSQL servers in Qt applications.
 
-
-
-Authors:
---------
-    Troll Tech AS, Norway
-
 %package -n libqt4-sql-mysql
-License:        QPL, GPL
-Group:          Development/Libraries/C and C++
 Summary:        Qt 4 MySQL support
+Group:          Development/Libraries/C and C++
 Requires:       libqt4-sql = %version
 Provides:       libqt4_sql_backend  = %version
 Obsoletes:      qt-sql-mysql < 4.6.0
@@ -85,12 +73,6 @@
 %description -n libqt4-sql-mysql
 A plugin to support MySQL server in Qt applications.
 
-
-
-Authors:
---------
-    Troll Tech AS, Norway
-
 %build
 export QTDIR=$PWD
 export PATH=$PWD/bin:$PATH



-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to