Hello community, here is the log from the commit of package qt3 for openSUSE:Factory checked in at 2012-04-02 19:48:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt3 (Old) and /work/SRC/openSUSE:Factory/.qt3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt3", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/qt3/qt3-devel-doc.changes 2012-02-15 16:17:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qt3.new/qt3-devel-doc.changes 2012-04-02 19:48:07.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 2 11:06:28 UTC 2012 - [email protected] + +- delay libpng15 porting, it's gone from factory again + +------------------------------------------------------------------- @@ -4,0 +10,10 @@ + +------------------------------------------------------------------- +Mon Jan 9 19:46:32 UTC 2012 - [email protected] + +- patch for libpng15 + +------------------------------------------------------------------- +Wed Dec 7 14:15:22 UTC 2011 - [email protected] + +- fix license to be in spdx.org format --- /work/SRC/openSUSE:Factory/qt3/qt3-extensions.changes 2012-01-11 15:38:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qt3.new/qt3-extensions.changes 2012-04-02 19:48:07.000000000 +0200 @@ -2 +2 @@ -Wed Dec 7 14:14:08 UTC 2011 - [email protected] +Mon Apr 2 11:06:28 UTC 2012 - [email protected] @@ -4 +4,16 @@ -- use correct license syntax from qt3.spec +- delay libpng15 porting, it's gone from factory again + +------------------------------------------------------------------- +Wed Feb 8 12:47:18 UTC 2012 - [email protected] + +- remove dependency on libpng as it is not needed + +------------------------------------------------------------------- +Mon Jan 9 19:46:32 UTC 2012 - [email protected] + +- patch for libpng15 + +------------------------------------------------------------------- +Wed Dec 7 14:15:22 UTC 2011 - [email protected] + +- fix license to be in spdx.org format --- /work/SRC/openSUSE:Factory/qt3/qt3.changes 2012-01-11 15:38:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qt3.new/qt3.changes 2012-04-02 19:48:07.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Apr 2 11:06:28 UTC 2012 - [email protected] + +- delay libpng15 porting, it's gone from factory again + +------------------------------------------------------------------- +Wed Feb 8 12:47:18 UTC 2012 - [email protected] + +- remove dependency on libpng as it is not needed + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.RWxXVe/_old 2012-04-02 19:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.RWxXVe/_new 2012-04-02 19:50:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt3-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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: qt3-devel-doc BuildRequires: cups-devel BuildRequires: freeglut-devel @@ -23,6 +24,11 @@ BuildRequires: pkgconfig BuildRequires: qt3-devel BuildRequires: update-desktop-files +%if %suse_version < 1130 +BuildRequires: libpng-devel +%else +BuildRequires: libpng14-devel +%endif Url: http://www.trolltech.com/ Summary: Documentation for the Qt 3 Development Kit License: GPL-2.0 or GPL-3.0 or QPL-1.0 @@ -114,6 +120,7 @@ Patch137: popen-leak-fix.diff Patch138: qt3-libpng14.diff Patch139: gcc46.diff +Patch140: qt-3.3.8-libpng15.patch # TQt integration Patch200: qt-3.3.8c.diff @@ -126,21 +133,6 @@ You will find documentation, precompiled examples, and a tutorial for getting started with Qt in /usr/lib/qt3/doc. -This package contains the documentation for the Qt 3 Development Kit. - -You will find documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3/doc. - -This package contains the documentation for the Qt 3 Development Kit. - -You will find documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3/doc. - -This package contains the documentation for the Qt 3 Development Kit. - -You will find documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3/doc. - %define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial %prep @@ -206,7 +198,9 @@ %patch135 %patch136 %patch137 -%if %suse_version > 1120 +%if %suse_version > 1220 +%patch140 +%else %patch138 -p1 %endif %patch139 @@ -224,21 +218,6 @@ This package contains the documentation for the Qt 3 Development Kit. You will find documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3/doc. - -This package contains the documentation for the Qt 3 Development Kit. - -You will find documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3/doc. - -This package contains the documentation for the Qt 3 Development Kit. - -You will find documentation, precompiled examples, and a tutorial for -getting started with Qt in /usr/lib/qt3/doc. - -This package contains the documentation for the Qt 3 Development Kit. - -You will find documentation, precompiled examples, and a tutorial for getting started with Qt in /usr/lib/qt3/doc. %build ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.RWxXVe/_old 2012-04-02 19:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.RWxXVe/_new 2012-04-02 19:50:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt3-extensions # -# 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,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: qt3-extensions BuildRequires: cups-devel BuildRequires: krb5-devel @@ -24,7 +25,9 @@ BuildRequires: sqlite2-devel BuildRequires: unixODBC-devel BuildRequires: update-desktop-files +%if %suse_version > 1020 BuildRequires: fdupes +%endif Version: 3.3.8c Release: 0 Requires: qt3 = %version @@ -109,6 +112,7 @@ Patch137: popen-leak-fix.diff Patch138: qt3-libpng14.diff Patch139: gcc46.diff +Patch140: qt-3.3.8-libpng15.patch # TQt integration Patch200: qt-3.3.8c.diff @@ -119,15 +123,6 @@ This package contains extension libraries for Qt 3, such as the Netscape plug-in modules. -This package contains extension libraries for Qt 3, such as the -Netscape plug-in modules. - -This package contains extension libraries for Qt 3, such as the -Netscape plug-in modules. - -This package contains extension libraries for Qt 3, such as the -Netscape plug-in modules. - %define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial %prep @@ -193,7 +188,9 @@ %patch135 %patch136 %patch137 -%if %suse_version > 1120 +%if %suse_version > 1220 +%patch140 +%else %patch138 -p1 %endif %patch139 @@ -211,15 +208,6 @@ This package contains extension libraries for Qt 3, such as the Netscape plug-in modules. -This package contains extension libraries for Qt 3, such as the -Netscape plug-in modules. - -This package contains extension libraries for Qt 3, such as the -Netscape plug-in modules. - -This package contains extension libraries for Qt 3, such as the -Netscape plug-in modules. - %package -n qt3-devel-examples Summary: Programming Examples for Qt 3 Group: Development/Sources ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.RWxXVe/_old 2012-04-02 19:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.RWxXVe/_new 2012-04-02 19:50:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt3 # -# 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,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: qt3 #Remember also to modify Requires in -devel package BuildRequires: Mesa-devel @@ -27,7 +28,7 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel Url: http://www.trolltech.com/ -%if %suse_version > 1210 +%if %suse_version > 1220 BuildRequires: libpng15-compat-devel %else BuildRequires: libpng14-compat-devel @@ -120,9 +121,7 @@ Patch135: parseFontName.diff Patch136: qt3-no-date.diff Patch137: popen-leak-fix.diff -%if %suse_version <= 1210 Patch138: qt3-libpng14.diff -%endif Patch139: gcc46.diff Patch140: qt-3.3.8-libpng15.patch @@ -209,10 +208,10 @@ %patch135 %patch136 %patch137 -%if %suse_version <= 1210 -%patch138 -p1 -%else +%if %suse_version > 1220 %patch140 +%else +%patch138 -p1 %endif %patch139 %patch200 @@ -226,10 +225,15 @@ %package devel Summary: Include Files and Libraries mandatory for Development -License: GPL-2.0 ; GPL-3.0 ; QPL-1.0 Group: Development/Libraries/X11 +Requires: c++_compiler +Requires: cups-devel +Requires: freetype2-devel +Requires: libjpeg-devel +Requires: libmng-devel +Requires: pkgconfig Requires: qt3 = %version -Requires: pkgconfig cups-devel freetype2-devel libmng-devel libjpeg-devel c++_compiler xorg-x11-devel +Requires: xorg-x11-devel %if %suse_version > 1120 Recommends: libpng14-compat-devel Requires: libpng-devel @@ -239,7 +243,8 @@ %if %suse_version > 1000 Requires: Mesa-devel %else -Requires: xorg-x11-Mesa xorg-x11-Mesa-devel +Requires: xorg-x11-Mesa +Requires: xorg-x11-Mesa-devel %endif %ifnarch x86_64 s390x sparc64 ppc64 mips64 Conflicts: devel_libs-32bit ++++++ qt3-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.RWxXVe/_old 2012-04-02 19:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.RWxXVe/_new 2012-04-02 19:50:29.000000000 +0200 @@ -18,7 +18,7 @@ BuildRequires: libpng14-devel %endif URL: http://www.trolltech.com/ -License: GPL, QPL +License: GPL-2.0 or GPL-3.0 or QPL-1.0 Autoreqprov: on Summary: Qt 3 Development Kit Group: Documentation/HTML ++++++ qt3-extensions.spec.in ++++++ --- /var/tmp/diff_new_pack.RWxXVe/_old 2012-04-02 19:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.RWxXVe/_new 2012-04-02 19:50:29.000000000 +0200 @@ -15,7 +15,7 @@ %if %suse_version > 1020 BuildRequires: fdupes %endif -License: GPL, QPL +License: GPL-2.0 or GPL-3.0 or QPL-1.0 Version: 3.3.8c Release: 1 Autoreqprov: on -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
