Hello community, here is the log from the commit of package qt3 checked in at Sat Apr 15 11:43:34 CEST 2006. -------- --- KDE/qt3/qt3-devel-doc.changes 2006-04-13 15:41:11.000000000 +0200 +++ STABLE/qt3/qt3-devel-doc.changes 2006-04-15 11:43:01.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 14 01:46:36 CEST 2006 - dmueller@suse.de + +- drop linguist3.png/desktop as its unused and install + linguist.desktop instead (fixes build failure). + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3-static.changes: same change qt3.changes: same change Old: ---- linguist3.desktop linguist3.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.XQUYmU/_old 2006-04-15 11:43:15.000000000 +0200 +++ /var/tmp/diff_new_pack.XQUYmU/_new 2006-04-15 11:43:15.000000000 +0200 @@ -18,7 +18,7 @@ Summary: Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.5 -Release: 51 +Release: 53 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -34,8 +34,6 @@ Source3: qtrc Source4: assistant3.png Source6: assistant3.desktop -Source7: linguist3.png -Source8: linguist3.desktop Source10: qt3.sh Source11: qt3.csh Source12: qt3-%version-translations.tar.bz2 @@ -263,6 +261,9 @@ /usr/share/pixmaps/assistant3.png %changelog -n qt3-devel-doc +* Fri Apr 14 2006 - dmueller@suse.de +- drop linguist3.png/desktop as its unused and install + linguist.desktop instead (fixes build failure). * Mon Apr 10 2006 - dmueller@suse.de - strip installed static libraries - fix file conflict with Qt4 packages ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.XQUYmU/_old 2006-04-15 11:43:15.000000000 +0200 +++ /var/tmp/diff_new_pack.XQUYmU/_new 2006-04-15 11:43:15.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: cups-devel krb5-devel libdrm-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GPL, QPL Version: 3.3.5 -Release: 51 +Release: 53 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -29,8 +29,6 @@ Source3: qtrc Source4: assistant3.png Source6: assistant3.desktop -Source7: linguist3.png -Source8: linguist3.desktop Source10: qt3.sh Source11: qt3.csh Source12: qt3-%version-translations.tar.bz2 @@ -385,11 +383,10 @@ %suse_update_desktop_file -i designer Qt Development GUIDesigner %suse_update_desktop_file -i linguist Qt Development Translation mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps -install -m 0644 %SOURCE7 $RPM_BUILD_ROOT/usr/share/pixmaps/ perl -pi -e 's/Icon=designer/Icon=designer3/' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop mv ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop ${RPM_BUILD_ROOT}/usr/share/applications/designer3.desktop 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,linguist}.png +rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/designer.png ##### these files are not getting installed by "make install" ... bug ? # # @@ -491,7 +488,7 @@ /usr/lib/qt3/%_lib/libeditor.* /usr/share/applications/* /usr/share/pixmaps/designer3.png -/usr/share/pixmaps/linguist3.png +/usr/share/pixmaps/linguist.png %files -n qt3-examples %defattr(-,root,root) @@ -504,6 +501,9 @@ %{_mandir}/man*/* %changelog -n qt3-extensions +* Fri Apr 14 2006 - dmueller@suse.de +- drop linguist3.png/desktop as its unused and install + linguist.desktop instead (fixes build failure). * Mon Apr 10 2006 - dmueller@suse.de - strip installed static libraries - fix file conflict with Qt4 packages ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.XQUYmU/_old 2006-04-15 11:43:15.000000000 +0200 +++ /var/tmp/diff_new_pack.XQUYmU/_new 2006-04-15 11:43:15.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.5 -Release: 51 +Release: 53 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -28,8 +28,6 @@ Source3: qtrc Source4: assistant3.png Source6: assistant3.desktop -Source7: linguist3.png -Source8: linguist3.desktop Source10: qt3.sh Source11: qt3.csh Source12: qt3-%version-translations.tar.bz2 @@ -272,6 +270,9 @@ #/usr/lib/qt3/%{_lib}/libqt-mini.a %changelog -n qt3-static +* Fri Apr 14 2006 - dmueller@suse.de +- drop linguist3.png/desktop as its unused and install + linguist.desktop instead (fixes build failure). * Mon Apr 10 2006 - dmueller@suse.de - strip installed static libraries - fix file conflict with Qt4 packages ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.XQUYmU/_old 2006-04-15 11:43:15.000000000 +0200 +++ /var/tmp/diff_new_pack.XQUYmU/_new 2006-04-15 11:43:15.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.5 -Release: 51 +Release: 53 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -30,8 +30,6 @@ Source3: qtrc Source4: assistant3.png Source6: assistant3.desktop -Source7: linguist3.png -Source8: linguist3.desktop Source10: qt3.sh Source11: qt3.csh Source12: qt3-%version-translations.tar.bz2 @@ -398,6 +396,9 @@ /etc/profile.d/qt3.* %changelog -n qt3 +* Fri Apr 14 2006 - dmueller@suse.de +- drop linguist3.png/desktop as its unused and install + linguist.desktop instead (fixes build failure). * Mon Apr 10 2006 - dmueller@suse.de - strip installed static libraries - fix file conflict with Qt4 packages ++++++ qt3-devel-doc.spec.in ++++++ --- KDE/qt3/qt3-devel-doc.spec.in 2006-03-13 17:01:59.000000000 +0100 +++ STABLE/qt3/qt3-devel-doc.spec.in 2006-04-14 10:45:27.000000000 +0200 @@ -27,172 +27,6 @@ %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN -Source0: qt%{x11_free}%rversion.tar.bz2 -Source1: build_script.sh -Source2: qtconfig3.desktop -Source3: asian-qtrc -Source4: assistant3.png -Source6: assistant3.desktop -Source7: linguist3.png -Source8: linguist3.desktop -Source10: qt3.sh -Source11: qt3.csh -Source12: qt3-%version-translations.tar.bz2 -Source100: qtkdeintegration_x11.cpp -Source101: qtkdeintegration_x11_p.h -Patch1: aliasing.diff -Patch2: head.diff -Patch4: qt3-never-strip.diff -Patch5: external-libs.diff -Patch6: 0001-dnd_optimization.patch -Patch7: 0002-dnd_active_window_fix.patch -Patch8: 0007-qpixmap_constants.patch -Patch11: 0038-dragobject-dont-prefer-unknown.patch -Patch12: qtrc-path.diff -Patch13: xcursors-cache-fix.patch -Patch14: lib64-plugin-support.diff -Patch15: pluginmanager-fix.diff -Patch18: no-rpath.dif -Patch19: shut-up.diff -Patch20: rubberband.diff -Patch21: fix-GL-loading.diff -Patch23: fix-accessible.diff -# From http://www.freedesktop.org/wiki/Software_2fImmoduleQtDownload -Patch25: qt-x11-immodule-unified-qt3.3.3-20041203.diff -Patch26: fix-x11-immodule.diff -Patch27: xpm-handling-fixes.diff -Patch28: fix-key-release-event-with-imm.diff -Patch29: 0047-fix-kmenu-width.diff -Patch30: 0051-qtoolbar_77047.patch -Patch31: limit-image-size.diff -Patch34: 0005-qpixmap_mitshm.patch -Patch35: qt-transparency.patch -Patch36: fix-chinese-font-detection.diff -Patch936: fix-chinese-font-detection_old.diff -Patch37: 0055-qtextedit_zoom.patch -Patch38: 0048-qclipboard_hack_80072.patch -Patch39: fix-qtranslator-crash.diff -Patch40: 0059-qpopup_has_mouse.patch -Patch41: 0060-qpopup_ignore_mousepos.patch -Patch42: add_qexport_visibility.patch -Patch43: 0056-khotkeys_input_84434.patch -Patch50: enable-designer-plugins.diff -Patch53: fix-xinerama-dialog-placement.diff -Patch54: kmenu-search-fix.diff -Patch55: qt3-fix-cast.diff -Patch56: fonts-speedup.patch -Patch100: qt.patch -Patch101: qt3-arm-gcc4.patch -Patch103: disable-inputmethod-for-passords.patch -Patch104: qt-x11-immodule-capitalization-fix.diff -Patch105: 0065-fix_werror_with_gcc4.patch -Patch106: fix-qlistview-takeitem-crashes.diff -Patch107: qt3-khmer-script.patch -Patch108: fix-im-crash-on-exit.diff -Patch109: fix-immodule-buffer-overflow.diff -Patch110: qt-x11-immodule-qtextedit-fix.diff -Patch111: qt-x11-immodule-focus-handling.diff -Patch112: qt-x11-immodule-fix-inputcontext-crash.diff -Patch113: fix-assistant-path.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales@trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! - - - -Authors: --------- - Troll Tech AS, Norway - -%define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial -%prep -%setup -q -n qt%{x11_free}%rversion -%patch1 -%patch2 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 -%patch11 -%patch12 -%patch13 -if [ "%_lib" = "lib64" ]; then -%patch14 -fi -%patch15 -%patch18 -%patch19 -%if %suse_version > 920 -%patch20 -%endif -%patch23 -%patch25 -%patch26 -%patch27 -%patch28 -%patch29 -%patch30 -%patch31 -%patch34 -%patch35 -%if %suse_version > 1000 -%patch56 -%patch36 -%else -%patch936 -%endif -%patch37 -%patch38 -%patch39 -%patch40 -%patch41 -%patch42 -%patch43 -%patch100 -%patch53 -%patch54 -%patch55 -%patch101 -%patch103 -p1 -%patch104 -%patch105 -%patch106 -%patch107 -%patch108 -%patch109 -%patch110 -%patch111 -%patch112 -%patch113 -ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ -ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ -ln -sf $PWD/src/kernel/qinputcontext.h include/ -ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/ -ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/ -if [ %_lib = "lib" ]; then -sed 's,/lib64/,/lib/,' %PATCH21 | patch -p0 -else -%patch21 -fi -# copy qt kde integration files -cp %SOURCE100 %SOURCE101 src/kernel/ -cp %SOURCE101 include/private/ -cd translations -rm -v *.qm -tar xvjf %SOURCE12 -cd .. # COMMON-END %description ++++++ qt3-extensions.spec.in ++++++ --- KDE/qt3/qt3-extensions.spec.in 2006-04-11 17:57:32.000000000 +0200 +++ STABLE/qt3/qt3-extensions.spec.in 2006-04-14 10:46:25.000000000 +0200 @@ -157,11 +157,10 @@ %suse_update_desktop_file -i designer Qt Development GUIDesigner %suse_update_desktop_file -i linguist Qt Development Translation mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps -install -m 0644 %SOURCE7 $RPM_BUILD_ROOT/usr/share/pixmaps/ perl -pi -e 's/Icon=designer/Icon=designer3/' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop mv ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop ${RPM_BUILD_ROOT}/usr/share/applications/designer3.desktop 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,linguist}.png +rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/designer.png ##### these files are not getting installed by "make install" ... bug ? # @@ -265,7 +264,7 @@ /usr/lib/qt3/%_lib/libeditor.* /usr/share/applications/* /usr/share/pixmaps/designer3.png -/usr/share/pixmaps/linguist3.png +/usr/share/pixmaps/linguist.png %files -n qt3-examples %defattr(-,root,root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...