Hello community, here is the log from the commit of package scim-bridge for openSUSE:Factory checked in at 2015-09-30 05:51:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-bridge (Old) and /work/SRC/openSUSE:Factory/.scim-bridge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-bridge" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-bridge/scim-bridge.changes 2014-04-26 10:11:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-bridge.new/scim-bridge.changes 2015-09-30 05:51:03.000000000 +0200 @@ -1,0 +2,19 @@ +Sun Sep 13 06:28:21 UTC 2015 - i@marguerite.su + +- remove SLE_10 check +- remove gtk_prefix macro +- use scim_gtk2_immodule_* macros +- drop etc-x11-xim.d-scim-bridge-114 +- refactored xim.d-scim-bridge + * no more skim, no bother to check WINDOWMANAGER +- rename subpackages: scim-bridge-gtk2/qt4 +- add provides/obsoletes for the old subpackages +- baselibs.conf: scim-bridge-qt4 should supplement + scim-bridge and libqt4 +- add scim-bridge.1 manpage from debian. +- use Summary/Description from debian, which properly + describle the packages. +- provide alt names which are the same w/ debian +- install immodules to the correct places. + +------------------------------------------------------------------- Old: ---- etc-x11-xim.d-scim-bridge etc-x11-xim.d-scim-bridge-114 New: ---- scim-bridge.1 xim.d-scim-bridge ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-bridge.spec ++++++ --- /var/tmp/diff_new_pack.kifDZU/_old 2015-09-30 05:51:04.000000000 +0200 +++ /var/tmp/diff_new_pack.kifDZU/_new 2015-09-30 05:51:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-bridge # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,78 +17,72 @@ Name: scim-bridge -BuildRequires: docbook-xsl-stylesheets -BuildRequires: doxygen -BuildRequires: gtk2-devel -BuildRequires: libqt4-devel -BuildRequires: libtool -BuildRequires: scim-devel -Summary: Scim Bridge -License: LGPL-2.1+ -Group: System/I18n/Japanese Version: 0.4.16 Release: 0 -PreReq: /usr/bin/touch -# Provides: locale(scim:ja;ko) -Recommends: scim-bridge-gtk,scim-bridge-qt -Url: http://www.scim-im.org/ +Summary: Yet another IM client of SCIM +License: LGPL-2.1+ +Group: System/I18n/Japanese +Url: https://github.com/scim-im # CVS repository: # cvs -d:pserver:anonymous@scim.cvs.sourceforge.net:/cvsroot/scim login # cvs -z3 -d:pserver:anonymous@scim.cvs.sourceforge.net:/cvsroot/scim co scim-bridge -Source0: scim-bridge-%{version}.tar.bz2 -Source1: baselibs.conf -Source10: etc-x11-xim.d-scim-bridge -Source11: etc-x11-xim.d-scim-bridge-114 +Source: %{name}-%{version}.tar.bz2 +Source1: xim.d-%{name} +Source2: %{name}.1 +Source99: baselibs.conf Patch3: bug-351920-should-return-retval.patch Patch8: scim-bridge-0.4.15-gcc44.patch Patch9: scim-bridge-fix-vnc-display-check.diff Patch10: scim-bridge-reregister-type-module-if-reload.patch Patch11: scim-bridge-gcc47.patch +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: gtk2-devel +BuildRequires: libqt4-devel +BuildRequires: libtool +BuildRequires: scim-devel +Provides: scim-bridge-agent +Recommends: scim-bridge-gtk2 = %{version} +Recommends: scim-bridge-qt4 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define gtk_prefix %(pkg-config --variable=prefix gtk+-2.0) %description -Scim Bridge +Yet another IM client of SCIM. The immodules of scim-bridge +communicates with SCIM via socket. +scim-bridge has two parts: agent and client. scim-bridge (agent) +stands between SCIM and its clients (immodules), so the clients +only need to communicate with scim-bridge, because scim-bridge +was writen in C, it will solve some C++ ABI problems. - -Authors: --------- - Ryo Dairiki <ryo-dairiki@users.sourceforge.net> - -%package -n scim-bridge-gtk -Summary: Scim Bridge for gtk2 +%package gtk2 +Summary: Scim-bridge immodule for GTK+ 2.0 Group: System/I18n/Japanese Requires: %{name} = %{version} +Provides: scim-bridge-client-gtk +Provides: scim-bridge-gtk = %{version} +Obsoletes: scim-bridge-gtk <= %{version} Supplements: packageand(scim-bridge:gtk2) -%gtk2_immodule_requires - -%description -n scim-bridge-gtk -Scim Bridge for gtk2 - +%{scim_gtk2_immodule_requires} +%description gtk2 +Scim-bridge-gtk2 is the gtk+-2.0 client of scim-bridge, it provides +another gtk-immodule for SCIM. -Authors: --------- - Ryo Dairiki <ryo-dairiki@users.sourceforge.net> - -%package -n scim-bridge-qt -Summary: Scim Bridge for Qt +%package qt4 +Summary: Scim-bridge immodule for Qt4 Group: System/I18n/Japanese Requires: %{name} = %{version} +Provides: scim-bridge-client-qt4 +Provides: scim-bridge-qt = %{version} +Obsoletes: scim-bridge-qt <= %{version} Supplements: packageand(scim-bridge:libqt4) -%description -n scim-bridge-qt -Scim Bridge for Qt - - - -Authors: --------- - Ryo Dairiki <ryo-dairiki@users.sourceforge.net> +%description qt4 +Scim-bridge-qt4 is the qt4 client of scim-bridge, it provides +another qt-immodule for SCIM. %prep -%define qt4_plugindir %_libdir/qt4/plugins %setup -q -n %{name}-%{version} %patch3 -p1 %patch8 @@ -96,87 +90,82 @@ %patch10 -p1 %patch11 -p1 -find . -type f | xargs chmod u+w -#find . -name CVS -type d | xargs rm -r -find . -name .cvsignore -type f | xargs rm -f -#chmod 644 doc/icon/kasasagi.png -# hack to build with older distros -%if %suse_version < 1100 -sed -i -e'/supplements/d' $RPM_SOURCE_DIR/baselibs.conf -%endif - %build +export CFLAGS="%{optflags}" +%configure \ + --disable-static \ + --with-pic \ + --enable-agent \ + --enable-gtk2-immodule \ + --disable-qt3-immodule \ + --enable-qt4-immodule \ + --enable-documents \ + --enable-debug -./bootstrap - -libtoolize --force -c --automake - -export CFLAGS="$RPM_OPT_FLAGS" -%configure --disable-static --with-pic --enable-gtk2-immodule --disable-qt3-immodule \ - --enable-qt4-immodule --enable-documents - -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -make DESTDIR=${RPM_BUILD_ROOT} install -rm -f $RPM_BUILD_ROOT/%{gtk_prefix}/%{_lib}/gtk-2.0/immodules/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/ -%if %suse_version < 1210 -install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-scim-bridge-114 \ - $RPM_BUILD_ROOT/etc/X11/xim.d/scim-bridge -%else -install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-scim-bridge \ - $RPM_BUILD_ROOT/etc/X11/xim.d/scim-bridge -%endif +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -name "*.la" -delete -print + +mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xim.d/%{name} # install symlinks in /etc/X11/xim.d/$lang for all languages # where scim-bridge might be useful: PRIORITY=49 -pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ +pushd %{buildroot}%{_sysconfdir}/X11/xim.d/ for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \ pa ru sk vi zh_TW zh_CN zh_HK zh_SG \ de fr it es nl cs pl da nn nb fi en sv do mkdir $lang pushd $lang - ln -s ../scim-bridge $PRIORITY-scim-bridge + ln -s ../%{name} $PRIORITY-%{name} popd done popd -rm doc/Makefile* +# fix path +mkdir -p %{buildroot}%{_libdir}/qt4/plugins/inputmethods +mv %{buildroot}%{_prefix}/plugins/inputmethods/*.so %{buildroot}%{_libdir}/qt4/plugins/inputmethods/ +rm -rf %{buildroot}%{_prefix}/plugins +mkdir -p %{buildroot}%{_libdir}/gtk-2.0/2.10.0/immodules +mv %{buildroot}%{_libdir}/gtk-2.0/immodules/*.so %{buildroot}%{_libdir}/gtk-2.0/2.10.0/immodules/ +rm -rf %{buildroot}%{_libdir}/gtk-2.0/immodules + +# install manpage +mkdir -p %{buildroot}%{_mandir}/man1 +install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/ -%post -n scim-bridge-gtk -%gtk2_immodule_post +rm doc/Makefile* -%postun -n scim-bridge-gtk -%gtk2_immodule_postun +%post gtk2 +/sbin/ldconfig +%{scim_gtk2_immodule_post} + +%postun gtk2 +/sbin/ldconfig +%{scim_gtk2_immodule_postun} + +%post qt4 -p /sbin/ldconfig +%postun qt4 -p /sbin/ldconfig +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog doc -%dir /etc/X11/xim.d/ +%dir %{_sysconfdir}/X11/xim.d/ %config %{_sysconfdir}/X11/xim.d/* -%{_bindir}/scim-bridge +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1%{ext_man} -%files -n scim-bridge-gtk +%files gtk2 %defattr(-, root, root) -%{gtk_prefix}/%{_lib}/gtk-2.0/immodules +%{_libdir}/gtk-2.0/2.10.0/immodules/im-%{name}.so -%files -n scim-bridge-qt +%files qt4 %defattr(-, root, root) -%dir %qt4_plugindir/ -%dir %qt4_plugindir/inputmethods/ -%qt4_plugindir/inputmethods/im-scim-bridge*.so +%{_libdir}/qt4/plugins/inputmethods/im-%{name}.so %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.kifDZU/_old 2015-09-30 05:51:04.000000000 +0200 +++ /var/tmp/diff_new_pack.kifDZU/_new 2015-09-30 05:51:04.000000000 +0200 @@ -1,4 +1,12 @@ -scim-bridge-qt - supplements "packageand(scim-bridge-qt:qt3-<targettype>)" -scim-bridge-gtk - supplements "packageand(scim-bridge-gtk:gtk2-<targettype>)" +scim-bridge-qt4 + supplements "packageand(scim-bridge:libqt4-<targettype>)" + requires "scim-bridge-<targettype> = <version>" + provides "scim-bridge-gtk-<targettype> = <version>" + obsoletes "scim-bridge-gtk-<targettype> <= <version>" + provides "scim-bridge-client-qt-<targettype> = <version>" +scim-bridge-gtk2 + supplements "packageand(scim-bridge:gtk2-<targettype>)" + requires "scim-bridge-<targettype> = <version>" + provides "scim-bridge-gtk-<targettype> = <version>" + obsoletes "scim-bridge-gtk-<targettype> <= <version>" + provides "scim-bridge-client-gtk-<targettype> = <version>" ++++++ scim-bridge.1 ++++++ .\" Copyright 2006 ZhengPeng Hou <zhengpeng.hou@gmail.com>, .\" This man page is distributed under the same license as scim-bridge package. .\" .TH "SCIM-BRIDGE" "1" .SH "NAME" scim-bridge \(em Yet another IM client of SCIM. The im-module of scim-bridge communicates with scim via socket. .SH "SYNOPSIS" .PP \fBscim-bridge;\fR [\fB-h \fI\-\-help\fR\fP] [\fB-v\fI\-\-verbose\fR\fP] [\fB-q\fI\-\-quiet\fR\fP] [\fB-b\fI\-\-debugflags\fR\fP] [\fB-l\fI\-\-debuglevel\fR\fP] [\fB-standalone\fI\-\-standalone\fR\fP] [\fB-n\fI\-\-noexit\fR\fP] .SH "DESCRIPTION" .PP This manual page documents briefly the \fBscim-bridge;\fR and \fBbar\fR commands. .PP This manual page was written for the \fBDebian\fP distribution because the original program does not have a manual page. .SH "OPTIONS" .PP These programs follow the usual GNU command line syntax, with long options starting with two dashes (`\-'). A summary of options is included below. .IP "\fB-h\fP \fB\-\-help\fP " 10 Give this help list. .IP "\fB-v\fP \fB\-\-verbose\fP " 10 Verbosely print out the debug message into standard output.This option equals to '\-\-debuglevel=9 \-\-debugflags=all'. .IP "\fB-q\fP \fB\-\-quiet\fP " 10 Make it print no debug message at all.This option equals to '\-\-debuglevel=0 \-\-debugflags=none'. .IP "\fB-b\fP \fB\-\-debugflags\fP " 10 Set which category of debug output do you need.Select one or more from 'all', 'none', 'agent', 'messenger', 'imcontext', and 'scim'. .IP "\fB-l\fP \fB\-\-debuglevel\fP " 10 Set how verbosely should it print debug output.'\-\-debuglevel=0' equals to '\-\-queit', and '\-\-debuglevel=9' equals to '\-\-verbose'. .IP "\fB-standalone\fP \fB\-\-standalone\fP " 10 Given this, scim-brige won't daemonize itself. .IP "\fB-n\fP \fB\-\-noexit\fP " 10 Given this, scim-brige won't exit when there is no client. .SH "AUTHOR" scim-bridge is writen by Ryo Dairiki. .PP This manual page was written by Zhengpeng Hou zhengpeng-hou@ubuntu.com for the \fBDebian\fP system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 any later version published by the Free Software Foundation. .\" created by instant / docbook-to-man, Mon 03 Apr 2006, 10:00 ++++++ xim.d-scim-bridge ++++++ if ! type -p scim > /dev/null 2>&1 ; then echo "scim is not available." return 1 fi export XMODIFIERS="@im=SCIM" export GTK_IM_MODULE="scim-bridge:scim:xim" export QT_IM_SWITCHER=imsw-multi export QT_IM_MODULE=scim-bridge scim -d # success: return 0