From d9cfc5674c2d8381b745961a6c69b03e324a9247925542392338c5b6ecfdfc1d Mon Sep 17 00:00:00 2001 From: Xing Yin Date: Fri, 9 Sep 2011 18:59:47 +0000 Subject: [PATCH] Accepting request 81729 from home:stecue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated to Fcitx 4.1.1。XIM is used to keep compatibility with setup scripts. OBS-URL: https://build.opensuse.org/request/show/81729 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=5 --- fcitx-4.0.1.tar.bz2 | 3 --- fcitx-4.1.1_all.tar.bz2 | 3 +++ fcitx-kimpanel.desktop | 16 ++++++++++++ fcitx.changes | 10 +++++--- fcitx.spec | 57 ++++++++++++++++++++++++++++------------- 5 files changed, 65 insertions(+), 24 deletions(-) delete mode 100644 fcitx-4.0.1.tar.bz2 create mode 100644 fcitx-4.1.1_all.tar.bz2 create mode 100644 fcitx-kimpanel.desktop diff --git a/fcitx-4.0.1.tar.bz2 b/fcitx-4.0.1.tar.bz2 deleted file mode 100644 index 2bfdfd1..0000000 --- a/fcitx-4.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f6bb1584c5573016884626085baf25ead2b37b014d127c99f12e19425a45bbf -size 6726361 diff --git a/fcitx-4.1.1_all.tar.bz2 b/fcitx-4.1.1_all.tar.bz2 new file mode 100644 index 0000000..d5b60b4 --- /dev/null +++ b/fcitx-4.1.1_all.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca7aa74ef3b1e80f2b1b882fdbc977b2bdd0a3eb75dd470fb159c703e0da9a75 +size 6547617 diff --git a/fcitx-kimpanel.desktop b/fcitx-kimpanel.desktop new file mode 100644 index 0000000..a20c4f6 --- /dev/null +++ b/fcitx-kimpanel.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Name=Fcitx Kimpanel +Name[zh_CN]=Fcitx (使用Kimpanel) +Comment=Chinese Input Method (Use Kimpanel) +Comment[zh_CN]=中文输入法 (使用 Kimpanel) +Exec=fcitx -u fcitx-kimpanel-ui +Icon=fcitx +Terminal=false +Type=Application +Categories=System;Utility;X-SuSE-DesktopUtility; +StartupNotify=false +X-GNOME-Autostart-Phase=Applications +X-GNOME-AutoRestart=false +X-GNOME-Autostart-Notify=false +X-KDE-autostart-after=panel +X-KDE-StartupNotify=false diff --git a/fcitx.changes b/fcitx.changes index e3d77cc..b1ddf49 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,8 +1,12 @@ ------------------------------------------------------------------- -Tue Jun 14 00:56:36 UTC 2011 - swyear@gmail.com - +* Fri Sep 9 15:02:04 UTC 2011 stecue +- upstream version 4.1.1 +------------------------------------------------------------------- +* Wed Sep 7 19:49:14 UTC 2011 stecue +- upstream version 4.1.0 +------------------------------------------------------------------- +* Tue Jun 14 00:56:36 UTC 2011 swyear - Add start up script, README and template - ------------------------------------------------------------------- * Tue May 17 00:00:00 UTC 2011 stecue - upstream version 4.0.1. diff --git a/fcitx.spec b/fcitx.spec index 436e9f1..5ccf4c9 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -1,6 +1,6 @@ %define name fcitx -%define version 4.0.1 -%define release 1 +%define version 4.1.1 +%define release 2 %define prefix /usr %define fcitxbindir /usr/bin @@ -11,23 +11,28 @@ Summary: Free Chinese Input Toy for X (XIM) URL: http://www.fcitx.org/ Group: System/I18n/Chinese License: GPL -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}_all.tar.bz2 Source1: %{name}.desktop Source2: %{name}-configtool.desktop -Source3: xim.d-fcitx -Source4: fcitx-README.suse -Source5: xim.fcitx.suse.template +Source3: %{name}-kimpanel.desktop +Source4: xim.d-fcitx +Source5: fcitx-README.suse +Source6: xim.fcitx.suse.template +BuildRequires: gcc-c++ cmake libicu-devel xorg-x11-libX11-devel BuildRequires: cairo-devel BuildRequires: pango-devel %if 0%{?suse_version} #patch: catagories.patch -BuildRequires: dbus-1-devel +BuildRequires: dbus-1-devel dbus-1-glib-devel +Requires: dbus-1 dbus-1-glib %else -BuildRequires: dbus-devel +BuildRequires: dbus-devel dbus-glib-devel +Requires: dbus-1 dbus-glib %endif +Requires: libicu %if 0%{?suse_version} >= 1140 -Requires: gtk2-immodule-xim +Requires: gtk2-immodule-xim #Obsoletes: gtk2-immodule-amharic #Obsoletes: gtk2-immodule-thai #Obsoletes: gtk2-immodule-vietnamese @@ -67,16 +72,17 @@ The %{name}-devel package includes the header files for the FCITX package. %setup -q %build -%configure \ - --enable-dbus \ - --enable-tray +mkdir build +cd build +cmake .. -DENABLE_GTK3_IM_MODULE=off -DENABLE_QT_IM_MODULE=off -DENABLE_GTK2_IM_MODULE=off -DCMAKE_INSTALL_PREFIX=%{prefix} -DLIB_INSTALL_DIR=%{_libdir} make %install - -make DESTDIR=$RPM_BUILD_ROOT install-strip +cd build +make DESTDIR=%{buildroot} install install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/ +install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/ mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/ install -m 644 $RPM_SOURCE_DIR/xim.d-fcitx $RPM_BUILD_ROOT/etc/X11/xim.d/fcitx @@ -90,7 +96,6 @@ pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ popd done popd -rm -f $RPM_BUILD_ROOT%{_libdir}/libfcitx-config.la %find_lang %{name} @@ -99,7 +104,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libfcitx-config.la %clean [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} -%files -f %{name}.lang +#%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING INSTALL README %doc %{_datadir}/doc/fcitx/ @@ -111,15 +117,27 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libfcitx-config.la /etc/X11/xim.d/fcitx /etc/X11/xim.d/en/30-fcitx /etc/X11/xim.d/zh_CN/30-fcitx +%dir %{_libdir}/fcitx %dir %{_datadir}/fcitx %dir %{_datadir}/fcitx/data %dir %{_datadir}/fcitx/skin +%dir %{_datadir}/fcitx/addon +%dir %{_datadir}/fcitx/configdesc +%dir %{_datadir}/fcitx/pinyin +%dir %{_datadir}/fcitx/table %{_bindir}/* +%{_datadir}/locale/zh_CN/LC_MESSAGES/fcitx.mo %{_datadir}/applications/fcitx* -%{_datadir}/pixmaps/* +#%{_datadir}/pixmaps/* %{_datadir}/fcitx/data/* %{_datadir}/fcitx/skin/* -%{_libdir}/libfcitx* +%{_datadir}/fcitx/addon/* +%{_datadir}/fcitx/configdesc/* +%{_datadir}/fcitx/pinyin/* +%{_datadir}/fcitx/table/* +%{_datadir}/icons/* +%{_libdir}/fcitx/*.so +%{_libdir}/libfcitx*.so.* %{_mandir}/man1/createPYMB.1.gz %{_mandir}/man1/fcitx-remote.1.gz %{_mandir}/man1/fcitx.1.gz @@ -138,5 +156,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libfcitx-config.la %defattr(-,root,root,-) %{_libdir}/pkgconfig/*.pc %{_includedir}/* +%{_libdir}/libfcitx*.so +%{_libdir}/pkgconfig/*.pc +%{_datadir}/cmake/* %changelog