Hello community, here is the log from the commit of package scim-bridge checked in at Tue Oct 16 02:37:05 CEST 2007. -------- --- scim-bridge/scim-bridge.changes 2007-10-11 05:04:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/scim-bridge/scim-bridge.changes 2007-10-15 15:05:08.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 15 15:04:29 CEST 2007 - mfabian@suse.de + +- Bugzilla #331614: fix conflict between scim-bridge-qt and + scim-bridge-qt-32bit packages. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-bridge.spec ++++++ --- /var/tmp/diff_new_pack.n25273/_old 2007-10-16 02:36:57.000000000 +0200 +++ /var/tmp/diff_new_pack.n25273/_new 2007-10-16 02:36:57.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: docbook-xsl-stylesheets doxygen gtk2-devel libqt4-devel qt3-devel scim-devel Summary: Scim Bridge Version: 0.4.13 -Release: 31 +Release: 34 License: LGPL v2 or later Group: System/I18n/Japanese AutoReqProv: on @@ -93,6 +93,14 @@ %install make DESTDIR=${RPM_BUILD_ROOT} install rm -f $RPM_BUILD_ROOT/%{gtk_prefix}/%{_lib}/gtk-2.0/immodules/im-scim-bridge.*a +pushd $RPM_BUILD_ROOT/usr/lib/qt3/plugins/inputmethods/ + if [ %_lib = lib64 ]; then + mv im-scim-bridge.so im-scim-bridge.lib64.so + mv im-scim-bridge.la im-scim-bridge.lib64.la + else + : + fi +popd rm -f $RPM_BUILD_ROOT/usr/lib/qt3/plugins/inputmethods/im-scim-bridge.*a mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/ install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-scim-bridge \ @@ -135,9 +143,14 @@ %files -n scim-bridge-qt %defattr(-, root, root) +%dir /usr/lib/qt3/ +%dir /usr/lib/qt3/plugins/ %dir /usr/lib/qt3/plugins/inputmethods/ -/usr/lib/qt3/plugins/inputmethods/im-scim-bridge.so +/usr/lib/qt3/plugins/inputmethods/im-scim-bridge*.so %changelog +* Mon Oct 15 2007 - mfabian@suse.de +- Bugzilla #331614: fix conflict between scim-bridge-qt and + scim-bridge-qt-32bit packages. * Thu Oct 11 2007 - pwu@suse.de - fix missing header for dist beta build * Fri Aug 10 2007 - pwu@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org