SHA256
1
0
forked from pool/fcitx

Accepting request 81729 from home:stecue

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
This commit is contained in:
Xing Yin 2011-09-09 18:59:47 +00:00 committed by Git OBS Bridge
parent d23991c55c
commit d9cfc5674c
5 changed files with 65 additions and 24 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f6bb1584c5573016884626085baf25ead2b37b014d127c99f12e19425a45bbf
size 6726361

3
fcitx-4.1.1_all.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca7aa74ef3b1e80f2b1b882fdbc977b2bdd0a3eb75dd470fb159c703e0da9a75
size 6547617

16
fcitx-kimpanel.desktop Normal file
View File

@ -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

View File

@ -1,8 +1,12 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 14 00:56:36 UTC 2011 - swyear@gmail.com * Fri Sep 9 15:02:04 UTC 2011 stecue <stecue@gmail.com>
- upstream version 4.1.1
-------------------------------------------------------------------
* Wed Sep 7 19:49:14 UTC 2011 stecue <stecue@gmail.com>
- upstream version 4.1.0
-------------------------------------------------------------------
* Tue Jun 14 00:56:36 UTC 2011 swyear <swyear@gmail.com>
- Add start up script, README and template - Add start up script, README and template
------------------------------------------------------------------- -------------------------------------------------------------------
* Tue May 17 00:00:00 UTC 2011 stecue <stecue@gmail.com> * Tue May 17 00:00:00 UTC 2011 stecue <stecue@gmail.com>
- upstream version 4.0.1. - upstream version 4.0.1.

View File

@ -1,6 +1,6 @@
%define name fcitx %define name fcitx
%define version 4.0.1 %define version 4.1.1
%define release 1 %define release 2
%define prefix /usr %define prefix /usr
%define fcitxbindir /usr/bin %define fcitxbindir /usr/bin
@ -11,23 +11,28 @@ Summary: Free Chinese Input Toy for X (XIM)
URL: http://www.fcitx.org/ URL: http://www.fcitx.org/
Group: System/I18n/Chinese Group: System/I18n/Chinese
License: GPL License: GPL
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}_all.tar.bz2
Source1: %{name}.desktop Source1: %{name}.desktop
Source2: %{name}-configtool.desktop Source2: %{name}-configtool.desktop
Source3: xim.d-fcitx Source3: %{name}-kimpanel.desktop
Source4: fcitx-README.suse Source4: xim.d-fcitx
Source5: xim.fcitx.suse.template Source5: fcitx-README.suse
Source6: xim.fcitx.suse.template
BuildRequires: gcc-c++ cmake libicu-devel xorg-x11-libX11-devel
BuildRequires: cairo-devel BuildRequires: cairo-devel
BuildRequires: pango-devel BuildRequires: pango-devel
%if 0%{?suse_version} %if 0%{?suse_version}
#patch: catagories.patch #patch: catagories.patch
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel dbus-1-glib-devel
Requires: dbus-1 dbus-1-glib
%else %else
BuildRequires: dbus-devel BuildRequires: dbus-devel dbus-glib-devel
Requires: dbus-1 dbus-glib
%endif %endif
Requires: libicu
%if 0%{?suse_version} >= 1140 %if 0%{?suse_version} >= 1140
Requires: gtk2-immodule-xim Requires: gtk2-immodule-xim
#Obsoletes: gtk2-immodule-amharic #Obsoletes: gtk2-immodule-amharic
#Obsoletes: gtk2-immodule-thai #Obsoletes: gtk2-immodule-thai
#Obsoletes: gtk2-immodule-vietnamese #Obsoletes: gtk2-immodule-vietnamese
@ -67,16 +72,17 @@ The %{name}-devel package includes the header files for the FCITX package.
%setup -q %setup -q
%build %build
%configure \ mkdir build
--enable-dbus \ cd build
--enable-tray 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 make
%install %install
cd build
make DESTDIR=$RPM_BUILD_ROOT install-strip make DESTDIR=%{buildroot} install
install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/
install -m 644 %{SOURCE2} %{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/ 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 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 popd
done done
popd popd
rm -f $RPM_BUILD_ROOT%{_libdir}/libfcitx-config.la
%find_lang %{name} %find_lang %{name}
@ -99,7 +104,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libfcitx-config.la
%clean %clean
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
%files -f %{name}.lang #%files -f %{name}.lang
%files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL README %doc AUTHORS ChangeLog COPYING INSTALL README
%doc %{_datadir}/doc/fcitx/ %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/fcitx
/etc/X11/xim.d/en/30-fcitx /etc/X11/xim.d/en/30-fcitx
/etc/X11/xim.d/zh_CN/30-fcitx /etc/X11/xim.d/zh_CN/30-fcitx
%dir %{_libdir}/fcitx
%dir %{_datadir}/fcitx %dir %{_datadir}/fcitx
%dir %{_datadir}/fcitx/data %dir %{_datadir}/fcitx/data
%dir %{_datadir}/fcitx/skin %dir %{_datadir}/fcitx/skin
%dir %{_datadir}/fcitx/addon
%dir %{_datadir}/fcitx/configdesc
%dir %{_datadir}/fcitx/pinyin
%dir %{_datadir}/fcitx/table
%{_bindir}/* %{_bindir}/*
%{_datadir}/locale/zh_CN/LC_MESSAGES/fcitx.mo
%{_datadir}/applications/fcitx* %{_datadir}/applications/fcitx*
%{_datadir}/pixmaps/* #%{_datadir}/pixmaps/*
%{_datadir}/fcitx/data/* %{_datadir}/fcitx/data/*
%{_datadir}/fcitx/skin/* %{_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/createPYMB.1.gz
%{_mandir}/man1/fcitx-remote.1.gz %{_mandir}/man1/fcitx-remote.1.gz
%{_mandir}/man1/fcitx.1.gz %{_mandir}/man1/fcitx.1.gz
@ -138,5 +156,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libfcitx-config.la
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_includedir}/* %{_includedir}/*
%{_libdir}/libfcitx*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/cmake/*
%changelog %changelog