Hello community, here is the log from the commit of package qt3 for openSUSE:Factory checked in at 2012-11-05 06:31:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt3 (Old) and /work/SRC/openSUSE:Factory/.qt3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt3", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/qt3/qt3-devel-doc.changes 2012-09-20 15:31:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt3.new/qt3-devel-doc.changes 2012-11-05 06:31:28.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 15 10:19:54 UTC 2012 - co...@suse.com + +- apply png15 patch now + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.a3QZ6m/_old 2012-11-05 06:31:32.000000000 +0100 +++ /var/tmp/diff_new_pack.a3QZ6m/_new 2012-11-05 06:31:32.000000000 +0100 @@ -21,14 +21,10 @@ BuildRequires: freeglut-devel BuildRequires: freetype2-devel BuildRequires: gcc-c++ +BuildRequires: libpng-devel 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 @@ -198,7 +194,7 @@ %patch135 %patch136 %patch137 -%if %suse_version > 1320 +%if %suse_version > 1220 %patch140 %else %patch138 -p1 ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.a3QZ6m/_old 2012-11-05 06:31:32.000000000 +0100 +++ /var/tmp/diff_new_pack.a3QZ6m/_new 2012-11-05 06:31:32.000000000 +0100 @@ -18,6 +18,7 @@ Name: qt3-extensions BuildRequires: cups-devel +BuildRequires: fdupes BuildRequires: krb5-devel BuildRequires: mysql-devel BuildRequires: postgresql-devel @@ -25,9 +26,6 @@ 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 @@ -188,7 +186,7 @@ %patch135 %patch136 %patch137 -%if %suse_version > 1320 +%if %suse_version > 1220 %patch140 %else %patch138 -p1 @@ -309,7 +307,7 @@ cd tools make %{?jobs:-j%jobs} make INSTALL_ROOT=$RPM_BUILD_ROOT install -for i in qvfb qembed qconfig msg2qm mergetr ; do +for i in qembed qconfig msg2qm mergetr ; do cd "$i" && make %{?jobs:-j%jobs} && install -m 0755 $i ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/ && cd - done cd .. @@ -404,7 +402,6 @@ %files %defattr(-,root,root) /usr/lib/qt3/bin/qembed -/usr/lib/qt3/bin/qvfb %files -n qt3-mysql %defattr(-,root,root) ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.a3QZ6m/_old 2012-11-05 06:31:32.000000000 +0100 +++ /var/tmp/diff_new_pack.a3QZ6m/_new 2012-11-05 06:31:32.000000000 +0100 @@ -29,11 +29,7 @@ BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(glu) Url: http://www.trolltech.com/ -%if %suse_version > 1320 -BuildRequires: libpng15-compat-devel -%else -BuildRequires: libpng14-compat-devel -%endif +BuildRequires: libpng-devel # bug437293 %ifarch ppc64 Obsoletes: qt3-64bit @@ -209,7 +205,7 @@ %patch135 %patch136 %patch137 -%if %suse_version > 1320 +%if %suse_version > 1220 %patch140 %else %patch138 -p1 @@ -227,21 +223,16 @@ %package devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/X11 +Requires: Mesa-devel Requires: c++_compiler Requires: cups-devel Requires: freetype2-devel Requires: libjpeg-devel Requires: libmng-devel +Requires: libpng-devel Requires: pkgconfig Requires: qt3 = %version Requires: xorg-x11-devel -%if %suse_version > 1120 -Recommends: libpng14-compat-devel -Requires: libpng-devel -%else -Requires: libpng-devel -%endif -Requires: Mesa-devel Requires: pkgconfig(glu) %ifnarch x86_64 s390x sparc64 ppc64 mips64 Conflicts: devel_libs-32bit ++++++ qt3-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.a3QZ6m/_old 2012-11-05 06:31:32.000000000 +0100 +++ /var/tmp/diff_new_pack.a3QZ6m/_new 2012-11-05 06:31:32.000000000 +0100 @@ -8,18 +8,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: qt3-devel-doc BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ pkgconfig update-desktop-files qt3-devel -%if %suse_version < 1130 BuildRequires: libpng-devel -%else -BuildRequires: libpng14-devel -%endif URL: http://www.trolltech.com/ License: GPL-2.0 or GPL-3.0 or QPL-1.0 -Autoreqprov: on Summary: Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.8c ++++++ qt3-extensions.spec.in ++++++ --- /var/tmp/diff_new_pack.a3QZ6m/_old 2012-11-05 06:31:32.000000000 +0100 +++ /var/tmp/diff_new_pack.a3QZ6m/_new 2012-11-05 06:31:32.000000000 +0100 @@ -1,27 +1,37 @@ # -# spec file for package qt3-extensions (Version 3.3.8b) +# spec file for package qt3-extensions # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# 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 -Name: qt3-extensions -BuildRequires: cups-devel krb5-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files -%if %suse_version > 1020 -BuildRequires: fdupes -%endif -License: GPL-2.0 or GPL-3.0 or QPL-1.0 -Version: 3.3.8c -Release: 1 -Autoreqprov: on -Requires: qt3 = %version -Group: Development/Tools/Other -Summary: Qt3 Extensions +Name: qt3-extensions +BuildRequires: cups-devel +BuildRequires: krb5-devel +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: qt3-devel +BuildRequires: sqlite2-devel +BuildRequires: unixODBC-devel +BuildRequires: update-desktop-files +BuildRequires: fdupes +Version: 3.3.8c +Release: 0 +Requires: qt3 = %version +Summary: Qt3 Extensions +License: GPL-2.0 or GPL-3.0 or QPL-1.0 +Group: Development/Tools/Other # COMMON-BEGIN # COMMON-END @@ -39,11 +49,10 @@ the current Qt library! %package -n qt3-devel-examples -Summary: Programming Examples for Qt 3 -Autoreqprov: on -Group: Development/Sources -Provides: qt3-examples -Obsoletes: qt3-examples +Summary: Programming Examples for Qt 3 +Group: Development/Sources +Provides: qt3-examples +Obsoletes: qt3-examples %description -n qt3-devel-examples Qt is a program library for developing applications with graphical user @@ -59,9 +68,9 @@ the current Qt library! %package -n qt3-mysql -Summary: MySQL Plug-In for Qt -Provides: qt3_database_plugin -Group: Productivity/Databases/Clients +Summary: MySQL Plug-In for Qt +Group: Productivity/Databases/Clients +Provides: qt3_database_plugin %description -n qt3-mysql Qt is a program library for developing applications with graphical user @@ -77,9 +86,9 @@ the current Qt library! %package -n qt3-unixODBC -Summary: A UnixODBC Plug-In for Qt -Provides: qt3_database_plugin -Group: Productivity/Databases/Clients +Summary: A UnixODBC Plug-In for Qt +Group: Productivity/Databases/Clients +Provides: qt3_database_plugin %description -n qt3-unixODBC Qt is a program library for developing applications with graphical user @@ -95,9 +104,9 @@ the current Qt library! %package -n qt3-postgresql -Summary: A PostgreSQL Plug-In for Qt -Provides: qt3_database_plugin -Group: Productivity/Databases/Clients +Summary: A PostgreSQL Plug-In for Qt +Group: Productivity/Databases/Clients +Provides: qt3_database_plugin %description -n qt3-postgresql Qt is a program library for developing applications with graphical user @@ -113,9 +122,9 @@ the current Qt library! %package -n qt3-sqlite -Summary: SQLite Database Plug-In for Qt -Provides: qt3_database_plugin -Group: Development/Tools/Other +Summary: SQLite Database Plug-In for Qt +Group: Development/Tools/Other +Provides: qt3_database_plugin %description -n qt3-sqlite Qt is a program library for developing applications with graphical user @@ -131,12 +140,11 @@ the current Qt library! %package -n qt3-devel-tools -Summary: User Interface Builder and other tools (designer, assistant, linguist) -Autoreqprov: on -Requires: qt3-devel = %version -Provides: qt3-designer -Obsoletes: qt3-designer -Group: Development/Tools/GUI Builders +Summary: User Interface Builder and other tools (designer, assistant, linguist) +Group: Development/Tools/GUI Builders +Requires: qt3-devel = %version +Provides: qt3-designer +Obsoletes: qt3-designer %description -n qt3-devel-tools Qt is a program library for developing applications with graphical user @@ -152,11 +160,10 @@ the current Qt library! %package -n qt3-man -Summary: Qt 3 Man Pages -Autoreqprov: on -Requires: qt3-devel = %version -Conflicts: qtman qt-man -Group: Documentation/Man +Summary: Qt 3 Man Pages +Group: Documentation/Man +Requires: qt3-devel = %version +Conflicts: qtman qt-man %description -n qt3-man Qt is a program library for developing applications with graphical user @@ -203,7 +210,7 @@ cd tools make %{?jobs:-j%jobs} make INSTALL_ROOT=$RPM_BUILD_ROOT install -for i in qvfb qembed qconfig msg2qm mergetr ; do +for i in qembed qconfig msg2qm mergetr ; do cd "$i" && make %{?jobs:-j%jobs} && install -m 0755 $i ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/ && cd - done cd .. @@ -281,7 +288,6 @@ %fdupes -s $RPM_BUILD_ROOT %endif - %pre if test -L usr/lib/qt3; then rm usr/lib/qt3 @@ -299,7 +305,6 @@ %files %defattr(-,root,root) /usr/lib/qt3/bin/qembed -/usr/lib/qt3/bin/qvfb %files -n qt3-mysql %defattr(-,root,root) @@ -355,4 +360,4 @@ %defattr(-,root,root) %{_mandir}/man*/* -%changelog -n qt3-extensions +%changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
