Mailinglist Archive: opensuse-commit (768 mails)

< Previous Next >
commit scim-bridge
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Wed, 04 Jun 2008 00:47:20 +0200
  • Message-id: <20080603224721.DDEAE6780BB@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package scim-bridge
checked in at Wed Jun 4 00:47:20 CEST 2008.


--------
--- scim-bridge/scim-bridge.changes 2008-04-10 13:00:32.000000000 +0200
+++ /mounts/work_src_done/STABLE/scim-bridge/scim-bridge.changes
2008-06-03 23:45:41.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jun 03 18:25:28 CEST 2008 - mfabian@xxxxxxx
+
+- bnc#391889: enable qt4 support.
+
+-------------------------------------------------------------------



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ scim-bridge.spec ++++++
--- /var/tmp/diff_new_pack.j14783/_old 2008-06-04 00:46:50.000000000 +0200
+++ /var/tmp/diff_new_pack.j14783/_new 2008-06-04 00:46:50.000000000 +0200
@@ -15,15 +15,13 @@
BuildRequires: docbook-xsl-stylesheets doxygen gtk2-devel intltool
libqt4-devel qt3-devel scim-devel
Summary: Scim Bridge
Version: 0.4.14
-Release: 42
+Release: 60
License: LGPL v2.1 or later
Group: System/I18n/Japanese
AutoReqProv: on
PreReq: /usr/bin/touch
Provides: locale(scim:ja;ko;zh)
-%if %suse_version > 1000
Recommends: scim-bridge-gtk,scim-bridge-qt
-%endif
Url: http://www.scim-im.org/
# CVS repository:
# cvs -d:pserver:anonymous@xxxxxxxxxxxxxxxxxxxxxxxx:/cvsroot/scim login
@@ -77,6 +75,7 @@
Ryo Dairiki <ryo-dairiki@xxxxxxxxxxxxxxxxxxxxx>

%prep
+%define qt4_plugindir %_libdir/qt4/plugins
%setup -q -n %{name}-%{version}
%patch2 -p1
%patch3 -p1
@@ -90,7 +89,7 @@
#autoreconf --force --install --verbose
./bootstrap
export CFLAGS="$RPM_OPT_FLAGS"
-%configure --disable-qt4-immodule
+%configure --enable-gtk2-immodule --enable-qt3-immodule --enable-qt4-immodule
make

%install
@@ -105,6 +104,17 @@
fi
popd
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/plugins/inputmethods/im-scim-bridge.*a
+mkdir -p $RPM_BUILD_ROOT/%qt4_plugindir/inputmethods
+mv $RPM_BUILD_ROOT/usr/plugins/inputmethods/im-scim-bridge*
$RPM_BUILD_ROOT/%qt4_plugindir/inputmethods
+pushd $RPM_BUILD_ROOT/%qt4_plugindir/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/%qt4_plugindir/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 \
$RPM_BUILD_ROOT/etc/X11/xim.d/scim-bridge
@@ -150,8 +160,13 @@
%dir /usr/lib/qt3/plugins/
%dir /usr/lib/qt3/plugins/inputmethods/
/usr/lib/qt3/plugins/inputmethods/im-scim-bridge*.so
+%dir %qt4_plugindir/
+%dir %qt4_plugindir/inputmethods/
+%qt4_plugindir/inputmethods/im-scim-bridge*.so

%changelog
+* Tue Jun 03 2008 mfabian@xxxxxxx
+- bnc#391889: enable qt4 support.
* Thu Apr 10 2008 ro@xxxxxxx
- added baselibs.conf file to build xxbit packages
for multilib support




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages