Hello community, here is the log from the commit of package qt3 checked in at Thu Aug 17 18:24:25 CEST 2006. -------- --- KDE/qt3/qt3-devel-doc.changes 2006-08-01 17:23:53.000000000 +0200 +++ qt3/qt3-devel-doc.changes 2006-08-17 18:23:37.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 17 13:42:28 CEST 2006 - stbinner@suse.de + +- fix qt3-devel-tools file conflict with qt-devel-doc + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3-static.changes: same change qt3.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.qyef5G/_old 2006-08-17 18:23:49.000000000 +0200 +++ /var/tmp/diff_new_pack.qyef5G/_new 2006-08-17 18:23:49.000000000 +0200 @@ -18,7 +18,7 @@ Summary: Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.6 -Release: 11 +Release: 12 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -221,6 +221,8 @@ /usr/share/pixmaps/assistant3.png %changelog -n qt3-devel-doc +* Thu Aug 17 2006 - stbinner@suse.de +- fix qt3-devel-tools file conflict with qt-devel-doc * Tue Aug 01 2006 - stbinner@suse.de - disable noisy debug message in qt-x11-immodule-unified diff * Sun Jul 09 2006 - stbinner@suse.de ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.qyef5G/_old 2006-08-17 18:23:49.000000000 +0200 +++ /var/tmp/diff_new_pack.qyef5G/_new 2006-08-17 18:23:49.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: cups-devel krb5-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GPL, QPL Version: 3.3.6 -Release: 11 +Release: 12 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -349,6 +349,8 @@ install -m 0644 tools/assistant/images/designer.png $RPM_BUILD_ROOT/usr/share/pixmaps/designer3.png rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/designer.png 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 ? # # @@ -450,7 +452,7 @@ /usr/lib/qt3/%_lib/libeditor.* /usr/share/applications/* /usr/share/pixmaps/designer3.png -/usr/share/pixmaps/linguist.png +/usr/share/pixmaps/linguist3.png %files -n qt3-examples %defattr(-,root,root) @@ -463,6 +465,8 @@ %{_mandir}/man*/* %changelog -n qt3-extensions +* Thu Aug 17 2006 - stbinner@suse.de +- fix qt3-devel-tools file conflict with qt-devel-doc * Tue Aug 01 2006 - stbinner@suse.de - disable noisy debug message in qt-x11-immodule-unified diff * Sun Jul 09 2006 - stbinner@suse.de ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.qyef5G/_old 2006-08-17 18:23:49.000000000 +0200 +++ /var/tmp/diff_new_pack.qyef5G/_new 2006-08-17 18:23:49.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.6 -Release: 11 +Release: 12 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -230,6 +230,8 @@ #/usr/lib/qt3/%{_lib}/libqt-mini.a %changelog -n qt3-static +* Thu Aug 17 2006 - stbinner@suse.de +- fix qt3-devel-tools file conflict with qt-devel-doc * Tue Aug 01 2006 - stbinner@suse.de - disable noisy debug message in qt-x11-immodule-unified diff * Sun Jul 09 2006 - stbinner@suse.de ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.qyef5G/_old 2006-08-17 18:23:49.000000000 +0200 +++ /var/tmp/diff_new_pack.qyef5G/_new 2006-08-17 18:23:49.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.6 -Release: 11 +Release: 12 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -361,6 +361,8 @@ /etc/profile.d/qt3.* %changelog -n qt3 +* Thu Aug 17 2006 - stbinner@suse.de +- fix qt3-devel-tools file conflict with qt-devel-doc * Tue Aug 01 2006 - stbinner@suse.de - disable noisy debug message in qt-x11-immodule-unified diff * Sun Jul 09 2006 - stbinner@suse.de ++++++ qt3-extensions.spec.in ++++++ --- KDE/qt3/qt3-extensions.spec.in 2006-07-09 23:34:27.000000000 +0200 +++ qt3/qt3-extensions.spec.in 2006-08-17 14:10:30.000000000 +0200 @@ -163,6 +163,8 @@ install -m 0644 tools/assistant/images/designer.png $RPM_BUILD_ROOT/usr/share/pixmaps/designer3.png rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/designer.png 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 ? # @@ -266,7 +268,7 @@ /usr/lib/qt3/%_lib/libeditor.* /usr/share/applications/* /usr/share/pixmaps/designer3.png -/usr/share/pixmaps/linguist.png +/usr/share/pixmaps/linguist3.png %files -n qt3-examples %defattr(-,root,root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org