Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-01-06 11:45:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2011-12-02 13:21:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-01-06 11:45:38.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Dec 14 00:26:42 CET 2011 - [email protected] + +- fix license to LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0 (bnc#736425) + +------------------------------------------------------------------- +Thu Dec 8 13:12:43 UTC 2011 - [email protected] + +- sync license in devel-doc and plugins spec file + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.AsHsLM/_old 2012-01-06 11:45:45.000000000 +0100 +++ /var/tmp/diff_new_pack.AsHsLM/_new 2012-01-06 11:45:45.000000000 +0100 @@ -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.90 -Release: 1 +Release: 0 %define base_name libqt4 %define tar_version everywhere-opensource-src-4.8.0 # 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: GPL-3.0 or LGPL-2.1-with-nokia-exception-1.1 +Group: Documentation/HTML Requires: libqt4 = %version Requires: libqt4-devel-doc-data = %version Requires: libqt4-sql-sqlite >= %version @@ -147,9 +152,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 @@ -159,12 +163,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.AsHsLM/_old 2012-01-06 11:45:45.000000000 +0100 +++ /var/tmp/diff_new_pack.AsHsLM/_new 2012-01-06 11:45:45.000000000 +0100 @@ -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.90 -Release: 1 +Release: 0 %define base_name libqt4 %define tar_version everywhere-opensource-src-4.8.0 # 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: GPL-3.0 or LGPL-2.1-with-nokia-exception-1.1 +Group: System/Libraries # COMMON-BEGIN # COMMON-BEGIN Source: qt-everywhere-opensource-src-4.8.0-rc1.tar.gz @@ -139,9 +141,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 @@ -151,16 +152,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 @@ -169,16 +163,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 @@ -187,12 +174,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.AsHsLM/_old 2012-01-06 11:45:45.000000000 +0100 +++ /var/tmp/diff_new_pack.AsHsLM/_new 2012-01-06 11:45:45.000000000 +0100 @@ -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: GPL-3.0 ; LGPL-2.1+ -Group: System/Libraries -AutoReqProv: on Summary: C++ Program Library, Core Components +License: GPL-3.0 or 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.90 -Release: 1 +Release: 0 %define base_name libqt4 %define tar_version everywhere-opensource-src-4.8.0 # COMMON-VERSION-END @@ -156,9 +167,9 @@ # COMMON-END %package devel -License: GPL-2.0 ; GPL-3.0 -Group: Development/Libraries/X11 Summary: Qt Development Kit +License: GPL-3.0 or 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 @@ -190,9 +201,9 @@ %package -n libqt4-sql-sqlite -License: GPL-2.0 ; GPL-3.0 -Group: Development/Libraries/C and C++ Summary: Qt 4 sqlite plugin +License: GPL-3.0 or 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 @@ -205,9 +216,9 @@ %package x11 -License: GPL-2.0 ; GPL-3.0 -Group: Development/Libraries/C and C++ Summary: Qt 4 GUI related libraries +License: GPL-3.0 or LGPL-2.1-with-nokia-exception-1.1 +Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 Obsoletes: qt-x11-64bit @@ -225,9 +236,9 @@ %if %with_qt3support %package qt3support -License: GPL-2.0 ; GPL-3.0 -Group: System/Libraries Summary: C++ Program Library, Core Components +License: GPL-3.0 or LGPL-2.1-with-nokia-exception-1.1 +Group: System/Libraries # bug437293 %ifarch ppc64 Obsoletes: qt-qt3support-64bit @@ -247,9 +258,9 @@ %endif %package sql -License: GPL-2.0 ; GPL-3.0 -Group: Development/Libraries/C and C++ Summary: Qt 4 SQL related libraries +License: GPL-3.0 or LGPL-2.1-with-nokia-exception-1.1 +Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 Obsoletes: qt-sql-64bit @@ -268,9 +279,9 @@ %if %with_qtwebkit %package -n libQtWebKit4 -License: GPL-2.0 ; GPL-3.0 -Group: Development/Libraries/C and C++ Summary: Open source Web Browser engine based on Qt4 +License: BSD-3-Clause ; LGPL-2.0+ +Group: Development/Libraries/C and C++ Requires: libqt4-x11 = %version Provides: libQtDeclarative4 = 4.6.0 Obsoletes: libQtDeclarative4 < 4.6.0 @@ -284,9 +295,9 @@ %package -n libQtWebKit-devel -License: GPL-2.0 ; GPL-3.0 -Group: Development/Libraries/C and C++ Summary: Open source Web Browser engine based on Qt4 +License: BSD-3-Clause ; LGPL-2.0+ +Group: Development/Libraries/C and C++ Requires: libQtWebKit4 = %version Requires: libqt4-devel = %version @@ -300,9 +311,9 @@ %endif %package private-headers-devel -License: GPL-2.0 ; GPL-3.0 -Group: Development/Libraries/C and C++ Summary: Non-ABI stabile experimental API +License: GPL-3.0 or 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 @@ -314,9 +325,8 @@ %if %with_phonon %package -n phonon - -License: LGPL-2.0+ Summary: Phonon Multimedia Platform Abstraction +License: LGPL-2.0+ Group: Development/Libraries/KDE Requires: phonon-backend = %version Requires: libphonon4 = %version @@ -329,9 +339,8 @@ %package -n phonon-devel - -License: LGPL-2.0+ Summary: Phonon Multimedia Platform Abstraction +License: LGPL-2.0+ Group: Development/Libraries/KDE Requires: %name = %version Requires: libphonon4 = %version @@ -345,9 +354,8 @@ %package -n libphonon4 - -License: LGPL-2.0+ Summary: Phonon Multimedia Platform Abstraction +License: LGPL-2.0+ Group: Development/Libraries/KDE %requires_ge libqt4-x11 @@ -362,9 +370,8 @@ %if %with_phonon_backend %package -n phonon-backend-gstreamer-0_10 - -License: LGPL-2.0+ Summary: Phonon Multimedia Platform Abstraction +License: LGPL-2.0+ Group: Development/Libraries/KDE Provides: phonon-backend = %version Requires: libphonon4 = %version @@ -377,9 +384,8 @@ %package -n phonon-backend-xine - -License: LGPL-2.0+ Summary: Phonon Multimedia Platform Abstraction +License: LGPL-2.0+ Group: Development/Libraries/KDE Provides: phonon-backend = %version Requires: libphonon4 = %version ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.AsHsLM/_old 2012-01-06 11:45:45.000000000 +0100 +++ /var/tmp/diff_new_pack.AsHsLM/_new 2012-01-06 11:45:45.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: 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.AsHsLM/_old 2012-01-06 11:45:45.000000000 +0100 +++ /var/tmp/diff_new_pack.AsHsLM/_new 2012-01-06 11:45:45.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: 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]
