Hello community, here is the log from the commit of package gcin for openSUSE:Factory checked in at 2013-10-04 15:58:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcin (Old) and /work/SRC/openSUSE:Factory/.gcin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcin" Changes: -------- --- /work/SRC/openSUSE:Factory/gcin/gcin.changes 2013-07-29 17:41:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2013-10-04 15:58:11.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Oct 3 07:24:22 UTC 2013 - [email protected] + +- remove gcin_scripts_modify-XIM_103.diff + * qt3 is long dead, just drop scripts/modify-XIM which was also + targeting for Mandriva/Fedora +- split gcin-gtk2-immodule, it's better +- fix xim.d-gcin + * can't input in firefox/chrome, have to export GTK3_IM_MODULE + * /usr/bin is already in $PATH. no /usr/X11R6/bin at all. + * remove skim part, as it's dropped from openSUSE, newer scim + don't need skim to support kde4/kde3. + * remove the useless LC_TYPE test, we're installed, we just keep + every locale work, so just export'em. +- add patch: gcin-2.8.1-gtk_immodules_path.patch + * fix gtk2/3 immodule install path + +------------------------------------------------------------------- Old: ---- gcin_scripts_modify-XIM_103.diff New: ---- gcin-2.8.1-gtk_immodules_path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcin.spec ++++++ --- /var/tmp/diff_new_pack.I5f3dB/_old 2013-10-04 15:58:13.000000000 +0200 +++ /var/tmp/diff_new_pack.I5f3dB/_new 2013-10-04 15:58:13.000000000 +0200 @@ -16,41 +16,42 @@ # -Summary: Chinese input method server -License: LGPL-2.1 -Group: System/I18n/Chinese Name: gcin Version: 2.8.1 Release: 0 +Summary: Chinese input method server +License: LGPL-2.1 +Group: System/I18n/Chinese Url: http://hyperrate.com/dir.php?eid=67 -Source0: gcin-%{version}.tar.bz2 +Source: gcin-%{version}.tar.bz2 Source1: xim.d-gcin Source2: gcin-README.suse Source3: xim.gcin.suse.template -Patch1: gcin_scripts_modify-XIM_103.diff -Patch2: icon_path.diff -Patch3: gcin-libdir.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +# PATCH-FIX-UPSTREAM [email protected] - just install the _only_ icon to pixmaps +Patch1: icon_path.diff +# PATCH-FIX-UPSTREAM [email protected] - fix qt3 detection in configure +Patch2: gcin-libdir.patch +# PATCH-FIX-UPSTREAM [email protected] - fix gtk2/3 immodules install path +Patch3: gcin-2.8.1-gtk_immodules_path.patch BuildRequires: anthy-devel +BuildRequires: fdupes BuildRequires: gtk2-devel BuildRequires: libjpeg-devel BuildRequires: libqt4-devel BuildRequires: pkg-config BuildRequires: update-desktop-files -%gtk2_immodule_requires -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 BuildRequires: gtk3-devel %endif Requires: %{name}-branding -Requires: %{name}-qt4-immodule -Requires: gtk2 >= 2.2.4 -%if %suse_version > 1130 -Requires: %{name}-gtk3-immodule +Requires: %{name}-gtk2-immodule = %{version} +Requires: %{name}-qt4-immodule = %{version} +%if 0%{?suse_version} > 1130 +Requires: %{name}-gtk3-immodule = %{version} %endif -PreReq: /usr/bin/touch -Provides: locale(zh_TW;zh_HK;zh_MO) Recommends: libreoffice-gnome +Provides: locale(zh_TW;zh_HK;zh_MO) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description gcin is a Chinese input method server for traditional Chinese. @@ -60,14 +61,24 @@ Summary: Upstream branding of gcin License: LGPL-2.1 Group: System/I18n/Chinese +Requires: gcin = %{version} Supplements: packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) -Requires: gcin %description branding-upstream This package provides upstream look and feel for gcin +%package gtk2-immodule +Summary: Gcin gtk3 immodule +License: LGPL-2.1 +Group: System/I18n/Chinese +Requires: %{name} = %{version} +%gtk2_immodule_requires + +%description gtk2-immodule +gcin gtk2 immodule, support gtk2-based applications + %package qt4-immodule Summary: Gcin qt4 immodule License: GPL-2.0 @@ -86,7 +97,7 @@ %description anthy-module gcin anthy module, try this to input Japanese with libanthy -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 %package gtk3-immodule Summary: Gcin gtk3 immodule @@ -100,32 +111,39 @@ %endif %prep -%setup -%patch1 +%setup -q +%patch1 -p1 %patch2 -p1 %patch3 -p1 +cp -r %{SOURCE2} . +cp -r %{SOURCE3} . + +# scripts/modify-XIM is mainly for Fedora/Mandriva and Qt3, obsoleted +rm -rf scripts/modify-XIM +sed -i "s/modify-XIM//" scripts/Makefile + %build -%if %_lib == lib64 +%if %{_lib} == lib64 sed -e "s,^LIB='lib',LIB=lib64," -i configure %endif -CFLAGS="$RPM_OPT_FLAGS" %configure --prefix=/usr --use_i18n=Y \ +CFLAGS="%{optflags}" %configure --prefix=/usr --use_i18n=Y \ --use_anthy=Y --doc_version_dir=N -make +make %{?_smp_mflags} %install +%makeinstall -mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/ -install -m 644 $RPM_SOURCE_DIR/xim.d-gcin $RPM_BUILD_ROOT/etc/X11/xim.d/gcin +mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xim.d/gcin -DESTDIR=$RPM_BUILD_ROOT make install LIB=%_lib - -rm -rf $RPM_BUILD_ROOT/usr/share/doc +rm -rf %{buildroot}%{_datadir}/doc %suse_update_desktop_file -r -G "Set Up your inputmethod" gcin-tools Settings System SystemSetup + PRIORITY=30 -pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ +pushd %{buildroot}%{_sysconfdir}/X11/xim.d/ for lang in en zh_TW zh_HK zh_MO ; do mkdir $lang pushd $lang @@ -135,9 +153,10 @@ popd %find_lang %{name} +%fdupes %{buildroot} -# Convenient %define for the scriplets -%if "%_lib" == "lib64" +# Convenient definition for the scriplets +%if "%{_lib}" == "lib64" %define _gtk2_query_immodules %{_bindir}/gtk-query-immodules-2.0-64 %define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk64.immodules %else @@ -145,140 +164,28 @@ %define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk.immodules %endif -# Convenient %define for the scriplets -%if "%_lib" == "lib64" +# Convenient definition for the scriplets +%if "%{_lib}" == "lib64" %define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0-64 %else %define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0 %endif %define _gtk3_query_immodules_update_cache %{_gtk3_query_immodules} --update-cache -%files -f %{name}.lang -%defattr(-,root,root) -%doc README.html Changelog.html COPYING AUTHORS -%doc $RPM_SOURCE_DIR/xim.gcin.suse.template -%doc $RPM_SOURCE_DIR/gcin-README.suse -%dir /etc/X11/xim.d/ -%dir %{_libdir}/gcin -%dir %{_datadir}/gcin -%dir %{_datadir}/gcin/script -%dir %{_datadir}/gcin/table -%config /etc/X11/xim.d/* -%{_bindir}/* -%{_datadir}/gcin/table/*.gtab -%{_datadir}/gcin/table/*.kbm -%{_datadir}/gcin/table/gtab.list -%{_datadir}/gcin/table/*.tab2 -%{_datadir}/gcin/table/*.table -%{_datadir}/gcin/table/pin-juyin.xlt -%{_datadir}/gcin/table/*.dat -%{_datadir}/gcin/table/symbol-table -%{_datadir}/gcin/table/tsin-1.src -%{_datadir}/gcin/table/tsin32 -%{_datadir}/gcin/table/tsin32.idx -%{_datadir}/gcin/table/s-tsin32 -%{_datadir}/gcin/table/s-tsin32.idx -%{_datadir}/gcin/table/hangul-phrase.txt -%{_datadir}/gcin/script/* -%{_datadir}/icons/* -%{_datadir}/pixmaps/gcin.png -%{_datadir}/applications/* - -%{_libdir}/gtk-2.0/* -%{_libdir}/gcin/gcin* -%{_libdir}/gcin/libgcin* -%{_libdir}/gcin/intcode-module.so -%exclude %{_datadir}/icons/gcin/ar30-big.png -%exclude %{_datadir}/icons/gcin/ar30.png -%exclude %{_datadir}/icons/gcin/ar33.png -%exclude %{_datadir}/icons/gcin/array-symbols.png -%exclude %{_datadir}/icons/gcin/chewing.png -%exclude %{_datadir}/icons/gcin/cj543.png -%exclude %{_datadir}/icons/gcin/cj5.png -%exclude %{_datadir}/icons/gcin/cj.png -%exclude %{_datadir}/icons/gcin/dayi3.png -%exclude %{_datadir}/icons/gcin/en-kana-nippon.png -%exclude %{_datadir}/icons/gcin/en-tsin.png -%exclude %{_datadir}/icons/gcin/full-simp.png -%exclude %{_datadir}/icons/gcin/full-trad.png -%exclude %{_datadir}/icons/gcin/gcin-tray.png -%exclude %{_datadir}/icons/gcin/greek.png -%exclude %{_datadir}/icons/gcin/half-simp.png -%exclude %{_datadir}/icons/gcin/half-trad.png -%exclude %{_datadir}/icons/gcin/hangul.png -%exclude %{_datadir}/icons/gcin/intcode.png -%exclude %{_datadir}/icons/gcin/juyin.png -%exclude %{_datadir}/icons/gcin/jyutping.png -%exclude %{_datadir}/icons/gcin/kana-nippon.png -%exclude %{_datadir}/icons/gcin/latin-letters.png -%exclude %{_datadir}/icons/gcin/NewCJ3.png -%exclude %{_datadir}/icons/gcin/noseeing.png -%exclude %{_datadir}/icons/gcin/pinyin.png -%exclude %{_datadir}/icons/gcin/russian.png -%exclude %{_datadir}/icons/gcin/simplex.png -%exclude %{_datadir}/icons/gcin/simplex-punc.png -%exclude %{_datadir}/icons/gcin/symbols.png -%exclude %{_datadir}/icons/gcin/symbol_table.png -%exclude %{_datadir}/icons/gcin/tsin.png -%exclude %{_datadir}/icons/gcin/vocabulary.png - -%files branding-upstream -%defattr(-,root,root) -%{_datadir}/icons/gcin/ar30-big.png -%{_datadir}/icons/gcin/ar30.png -%{_datadir}/icons/gcin/ar33.png -%{_datadir}/icons/gcin/array-symbols.png -%{_datadir}/icons/gcin/chewing.png -%{_datadir}/icons/gcin/cj543.png -%{_datadir}/icons/gcin/cj5.png -%{_datadir}/icons/gcin/cj.png -%{_datadir}/icons/gcin/dayi3.png -%{_datadir}/icons/gcin/en-kana-nippon.png -%{_datadir}/icons/gcin/en-tsin.png -%{_datadir}/icons/gcin/full-simp.png -%{_datadir}/icons/gcin/full-trad.png -%{_datadir}/icons/gcin/gcin-tray.png -%{_datadir}/icons/gcin/greek.png -%{_datadir}/icons/gcin/half-simp.png -%{_datadir}/icons/gcin/half-trad.png -%{_datadir}/icons/gcin/hangul.png -%{_datadir}/icons/gcin/intcode.png -%{_datadir}/icons/gcin/juyin.png -%{_datadir}/icons/gcin/jyutping.png -%{_datadir}/icons/gcin/kana-nippon.png -%{_datadir}/icons/gcin/latin-letters.png -%{_datadir}/icons/gcin/NewCJ3.png -%{_datadir}/icons/gcin/noseeing.png -%{_datadir}/icons/gcin/pinyin.png -%{_datadir}/icons/gcin/russian.png -%{_datadir}/icons/gcin/simplex.png -%{_datadir}/icons/gcin/simplex-punc.png -%{_datadir}/icons/gcin/symbols.png -%{_datadir}/icons/gcin/symbol_table.png -%{_datadir}/icons/gcin/tsin.png -%{_datadir}/icons/gcin/vocabulary.png - -%files qt4-immodule -%defattr(-,root,root) -%{_libdir}/qt4/plugins/inputmethods/* +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig +%post anthy-module -p /sbin/ldconfig +%postun anthy-module -p /sbin/ldconfig -%files anthy-module -%defattr(-,root,root) -%{_libdir}/gcin/anthy-module.so - -%if %suse_version > 1130 - -%files gtk3-immodule -%defattr(-,root,root) -%dir %{_libdir}/gtk-3.0/immodules -%{_libdir}/gtk-3.0/immodules/im-gcin.so -%endif +%post gtk2-immodule +/sbin/ldconfig +%{_gtk2_query_immodules_update_cache} -%post +%postun gtk2-immodule /sbin/ldconfig %{_gtk2_query_immodules_update_cache} -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 %post gtk3-immodule /sbin/ldconfig #Add icons to gnome3 panel @@ -298,13 +205,38 @@ %{_gtk3_query_immodules_update_cache} %endif -%postun -/sbin/ldconfig -%if %suse_version > 1130 -%{_gtk2_query_immodules_update_cache} -%endif +%files -f %{name}.lang +%defattr(-,root,root) +%doc README.html Changelog.html COPYING AUTHORS gcin-README.suse xim.gcin.suse.template +%config %{_sysconfdir}/X11/xim.d/ +%{_bindir}/* +%{_libdir}/gcin/ +%{_datadir}/gcin/ +%{_datadir}/pixmaps/gcin.png +%{_datadir}/applications/* +%exclude %{_libdir}/gcin/anthy-module.so +%dir %{_datadir}/icons/gcin/ -%postun anthy-module -/sbin/ldconfig +%files branding-upstream +%defattr(-,root,root) +%{_datadir}/icons/gcin/* + +%files gtk2-immodule +%defattr(-,root,root) +%{_libdir}/gtk-2.0/2.10.0/immodules/im-gcin.so + +%files qt4-immodule +%defattr(-,root,root) +%{_libdir}/qt4/plugins/inputmethods/im-gcin.so + +%files anthy-module +%defattr(-,root,root) +%{_libdir}/gcin/anthy-module.so + +%if 0%{?suse_version} > 1130 +%files gtk3-immodule +%defattr(-,root,root) +%{_libdir}/gtk-3.0/3.0.0/immodules/im-gcin.so +%endif %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.I5f3dB/_old 2013-10-04 15:58:13.000000000 +0200 +++ /var/tmp/diff_new_pack.I5f3dB/_new 2013-10-04 15:58:13.000000000 +0200 @@ -1,6 +1,40 @@ gcin + requires "gcin-branding" + requires "gcin-gtk2-immodule-<targettype> = <version>" + requires "gcin-qt4-immodule-<targettype> = <version>" + recommends "gcin-gtk3-immodule-<targettype> = <version>" + recommends "libreoffice-gnome" + post "/sbin/ldconfig" + postun "/sbin/ldconfig" +gcin-gtk2-immodule + requires "gcin-<targettype> = <version>" + post "/sbin/ldconfig" + post "%if "%_lib" == "lib64"" + post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache" + post "%else" + post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache" + post "%endif" + postun "/sbin/ldconfig" + postun "%if "%_lib" == "lib64"" + postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache" + postun "%else" + postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache" + postun "%endif" gcin-gtk3-immodule + requires "gcin-<targettype> = <version>" + post "/sbin/ldconfig" + post "%if "%_lib" == "lib64"" + post "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache" + post "%else" + post "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache" + post "%endif" + postun "/sbin/ldconfig" + postun "%if "%_lib" == "lib64"" + postun "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache" + postun "%else" + postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache" + postun "%endif" gcin-qt4-immodule -gcin-qt3-immodule -gcin-anthy-module -gcin-chewing-module \ No newline at end of file + requires "gcin-<targettype> = <version>" + post "/sbin/ldconfig" + postun "/sbin/ldconfig" ++++++ gcin-2.8.1-gtk_immodules_path.patch ++++++ Index: gcin-2.8.1/gtk-im/Makefile =================================================================== --- gcin-2.8.1.orig/gtk-im/Makefile +++ gcin-2.8.1/gtk-im/Makefile @@ -1,7 +1,7 @@ include ../config.mak OBJS = imgcin.o gtkimcontextgcin.o -GTK2IM=gtk-2.0/immodules +GTK2IM=gtk-2.0/2.10.0/immodules GTKINC=`pkg-config --cflags gtk+-2.0` LDFLAGS=`pkg-config --libs gtk+-2.0` IMMODULES=$(libdir)/$(GTK2IM) Index: gcin-2.8.1/gtk3-im/Makefile =================================================================== --- gcin-2.8.1.orig/gtk3-im/Makefile +++ gcin-2.8.1/gtk3-im/Makefile @@ -1,7 +1,7 @@ include ../config.mak OBJS = imgcin.o gtkimcontextgcin.o -GTK3IM=gtk-3.0/immodules +GTK3IM=gtk-3.0/3.0.0/immodules GTKINC=`pkg-config --cflags gtk+-3.0` LDFLAGS=`pkg-config --libs gtk+-3.0` LDFLAGS+='-Wl,--as-needed' ++++++ xim.d-gcin ++++++ --- /var/tmp/diff_new_pack.I5f3dB/_old 2013-10-04 15:58:13.000000000 +0200 +++ /var/tmp/diff_new_pack.I5f3dB/_new 2013-10-04 15:58:13.000000000 +0200 @@ -1,68 +1,23 @@ -OLD_PATH=$PATH -PATH=/usr/bin:/usr/X11R6/bin:/opt/kde3/bin:$PATH - if ! type -p gcin > /dev/null 2>&1 ; then - echo "gcin is not available." - PATH=$OLD_PATH + echo "gcin is not installed. please run `sudo zypper in gcin`." return 1 fi -#when skim installed, Autostart must be "false". -#here we move $HOME/.kde/share/config/skimrc to skimrc.orig.gcin -case "$WINDOWMANAGER" in - *kde) - if type -p skim > /dev/null 2>&1 \ - && ! grep -i -q "^[[:space:]]*Autostart.*=.*false" $HOME/.kde/share/config/skimrc - then - if [ -f $HOME/.kde/share/config/skimrc.orig.gcin ] ; then - mv -f $HOME/.kde/share/config/skimrc $HOME/.kde/share/config/skimrc.orig.gcin - chmod 777 $HOME/.kde/share/config/skimrc.orig.gcin - fi - cat > $HOME/.kde/share/config/skimrc << __END -[General] -Autostart=false -__END - chmod 777 $HOME/.kde/share/config/skimrc - else - # do nothing - : - fi - - ;; - *) - # do nothing - ;; -esac - # If libreoffice-gnome was installed, Force OOo to use gtk-immodule -# so can gcin use on_the_spot mod to insert characters +# so gcin can use on_the_spot mod to insert characters if [ -f /usr/lib/libreoffice/program/gconfbe1.uno.so ] || [ -f /usr/lib64/libreoffice/program/gconfbe1.uno.so ] ; then export OOO_FORCE_DESKTOP=gnome fi -# Determine the LC_CTYPE locale category setting -tmplang=${LC_ALL-${LC_CTYPE-${LANG-en_US}}} +# Environment Variables +export LC_CTYPE=$LANG +export XMODIFIERS="@im=gcin" +export GTK_IM_MODULE=gcin +export GTK3_IM_MODULE=gcin +export QT_IM_SWITCHER=imsw-multi +export QT_IM_MODULE=gcin -case $tmplang in - zh_*) # Traditional Chinese and Simplify Chinese - export LC_CTYPE=$LANG - # So you can use either zh_TW.UTF-8 or zh_TW.Big5 or zh_CN.UTF-8 or zh_CN.GB2312 - export XMODIFIERS="@im=gcin" - export GTK_IM_MODULE=gcin - export QT_IM_SWITCHER=imsw-multi - export QT_IM_MODULE=gcin - gcin & - ;; - *) # for other languages try to export LC_TYPE=zh_TW.UTF-8(or you want to use LC_CTYPE=zh_CN.UTF-8), I'm not sure if this can work - export LC_CTYPE=$LANG - export XMODIFIERS="@im=gcin" - export GTK_IM_MODULE=gcin - export QT_IM_SWITCHER=imsw-multi - export QT_IM_MODULE=gcin - gcin & - ;; -esac -PATH=$OLD_PATH +gcin & # success: return 0 ++++++ xim.gcin.suse.template ++++++ --- /var/tmp/diff_new_pack.I5f3dB/_old 2013-10-04 15:58:13.000000000 +0200 +++ /var/tmp/diff_new_pack.I5f3dB/_new 2013-10-04 15:58:13.000000000 +0200 @@ -3,11 +3,10 @@ #logout and login again, that's all #for more infomations, see ~/.xim.template -#if any program can't input Chinese, try export LC_CTYPE=zh_TW.UTF-8, e.g - -#export LC_CTYPE=$LANG +export LC_CTYPE=$LANG export XMODIFIERS="@im=gcin" export GTK_IM_MODULE=gcin +export GTK3_IM_MODULE=gcin export QT_IM_SWITCHER=imsw-multi export QT_IM_MODULE=gcin gcin & -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
