Hello community, here is the log from the commit of package qt3 for openSUSE:Factory checked in at Mon Apr 5 18:49:44 CEST 2010. -------- --- KDE/qt3/qt3-devel-doc.changes 2010-01-21 14:24:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/qt3/qt3-devel-doc.changes 2010-04-05 17:33:18.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 5 16:00:15 CEST 2010 - dmueller@suse.de + +- build against libpng12 + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.nPyEwE/_old 2010-04-05 18:49:00.000000000 +0200 +++ /var/tmp/diff_new_pack.nPyEwE/_new 2010-04-05 18:49:00.000000000 +0200 @@ -26,7 +26,7 @@ Summary: Documentation for the Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.8b -Release: 96 +Release: 97 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -235,6 +235,7 @@ # %suse_update_desktop_file -i -u qtconfig3 Qt Utility DesktopSettings %suse_update_desktop_file -i assistant3 Qt Development Documentation + install -d -m 0755 ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/ ln -sf /usr/lib/qt3/doc/html ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/ mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.nPyEwE/_old 2010-04-05 18:49:00.000000000 +0200 +++ /var/tmp/diff_new_pack.nPyEwE/_new 2010-04-05 18:49:00.000000000 +0200 @@ -25,7 +25,7 @@ %endif License: GPL, QPL Version: 3.3.8b -Release: 99 +Release: 100 AutoReqProv: on Requires: qt3 = %version Group: Development/Tools/Other @@ -343,6 +343,7 @@ perl -pi -e 's,Exec=linguist,Exec=/usr/lib/qt3/bin/linguist,' ${RPM_BUILD_ROOT}/usr/share/applications/linguist.desktop perl -pi -e 's,Icon=linguist,Icon=linguist3,' ${RPM_BUILD_ROOT}/usr/share/applications/linguist.desktop mv ${RPM_BUILD_ROOT}/usr/share/pixmaps/linguist.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/linguist3.png + ##### these files are not getting installed by "make install" ... bug ? # # @@ -373,9 +374,11 @@ rm -f $RPM_BUILD_ROOT/usr/lib/qt3/bin/assistant rm -f $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/libqassistantclient.* rm -f $RPM_BUILD_ROOT/usr/lib/qt3/translations/assistant_de.qm + for l in $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/*.a; do strip --strip-unneeded $l done + %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT %endif ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.nPyEwE/_old 2010-04-05 18:49:00.000000000 +0200 +++ /var/tmp/diff_new_pack.nPyEwE/_new 2010-04-05 18:49:00.000000000 +0200 @@ -20,9 +20,14 @@ Name: qt3 #Remember also to modify Requires in -devel package -BuildRequires: Mesa-devel c++_compiler cups-devel freetype2-devel libjpeg-devel libmng-devel libpng-devel pkgconfig update-desktop-files xorg-x11-devel +BuildRequires: Mesa-devel c++_compiler cups-devel freetype2-devel libjpeg-devel libmng-devel pkgconfig update-desktop-files xorg-x11-devel Url: http://www.trolltech.com/ License: GPLv2 ; GPLv3 ; QPL .. +%if %suse_version > 1120 +BuildRequires: libpng12-compat-devel +%else +BuildRequires: libpng-devel +%endif Group: System/Libraries AutoReqProv: on # bug437293 @@ -32,7 +37,7 @@ # Summary: A library for developing applications with graphical user interfaces Version: 3.3.8b -Release: 96 +Release: 97 Provides: qt_library_%version Recommends: kdelibs3-default-style PreReq: /bin/grep @@ -206,7 +211,12 @@ License: GPLv2 ; GPLv3 ; QPL .. Summary: Include Files and Libraries mandatory for Development Requires: qt3 = %version -Requires: pkgconfig cups-devel freetype2-devel libmng-devel libpng-devel libjpeg-devel c++_compiler xorg-x11-devel +Requires: pkgconfig cups-devel freetype2-devel libmng-devel libjpeg-devel c++_compiler xorg-x11-devel +%if %suse_version > 1120 +Requires: libpng12-devel +%else +Requires: libpng-devel +%endif %if %suse_version > 1000 Requires: Mesa-devel %else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org