[fcitx] Update to fcitx 4.0.0
Chen Lei
supercyper at fedoraproject.org
Fri Nov 19 12:47:18 UTC 2010
commit ff7bde26df30ad99dac6abec4f70286f18bec9ef
Author: Chen Lei <supercyper at 163.com>
Date: Fri Nov 19 20:47:05 2010 +0800
Update to fcitx 4.0.0
.gitignore | 2 +-
fcitx.spec | 93 +++++++++++++++++++++++++++++++++-------------------------
sources | 2 +-
xinput-fcitx | 3 +-
4 files changed, 57 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d0b454d..8711d34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-fcitx-20100602.tar.bz2
+/fcitx-4.0.0_all.tar.gz
diff --git a/fcitx.spec b/fcitx.spec
index 1dcb435..a5573b7 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -1,57 +1,57 @@
-%define svndate 20100602
-%define svnver 366
%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf
Name: fcitx
Summary: Free Chinese Input Toy for X (XIM)
-Version: 3.6.3
-Release: 6.%{?svndate}svn_utf8%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
License: GPLv2+
-Group: System Environment/Libraries
+Group: User Interface/Desktops
URL: http://code.google.com/p/%{name}/
-#
-# The upstream svn trunk and the released tar ball are in GBK coding. We use the
-# UTF-8 branch. And upstream has planned to move to UTF-8 coding in some future
-# release.
-#
-#Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
-# The source for this package was pulled from upstream's vcs. Use the
-# following commands to generate the tarball:
-# svn export -r %{svnver} http://fcitx.googlecode.com/svn/branches/fcitx-utf8 fcitx-%{svndate}
-# tar -cjvf fcitx-%{svndate}.tar.bz2 fcitx-%{svndate}
-Source0: %{name}-%{svndate}.tar.bz2
+Source0: http://%{name}.googlecode.com/files/%{name}-%{version}_all.tar.gz
Source1: xinput-%{name}
-BuildRequires: autoconf automake
-BuildRequires: gettext-devel
-BuildRequires: libXtst-devel
-BuildRequires: libXft-devel
-BuildRequires: libXpm-devel
-BuildRequires: dbus-devel
-Requires: im-chooser
+BuildRequires: pango-devel dbus-devel
+BuildRequires: wget intltool
+Requires: %{name}-libs = %{version}-%{release}
+Requires: imsettings
Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives
%description
-Fcitx(Free Chinese Input Toy of X) is a collection of Simplified Chinese
+FCITX(Free Chinese Input Toy of X) is a collection of Simplified Chinese
input methods for Linux. It supports Pinyin, QuWei and Table-based input
methods. It's small and fast.
-This package is the UTF-8 branch of fcitx.
+%package libs
+Summary: Libraries for FCITX
+Group: System Environment/Libraries
+
+%description libs
+The %{name}-libs package provides shared libraries for FCITX.
+
+%package devel
+Summary: Development files for FCITX
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: libX11-devel
+
+%description devel
+The %{name}-devel package contains libraries and header files necessary for
+developing programs using FCITX libraries.
%prep
-%setup -q -n %{name}-%{svndate}
+%setup -q
%build
-# fix DSOLinking
-sed -i -e 's/fcitx_LDFLAGS =/fcitx_LDFLAGS = -ldl/g' src/core/Makefile.am
-./autogen.sh
-%configure --enable-dbus
+%configure --disable-static \
+ --enable-dbus \
+ --enable-tray
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-
make install INSTALL="install -p" DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/*.la
#fix doc path
mkdir __doc
@@ -62,7 +62,7 @@ rm -f __doc/{API.txt,Develop_Readme*,fcitx_trunk.doxyfile}
# install xinput config file
install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf}
-chmod 0755 %{buildroot}%{_datadir}/%{name}/tools/winmb2fcitx.py
+%find_lang %{name}
%clean
rm -rf %{buildroot}
@@ -77,21 +77,34 @@ if [ "$1" = "0" ]; then
[ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
fi
-%files
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING THANKS TODO
+%doc AUTHORS ChangeLog THANKS TODO
%doc __doc/*
-# winmb2fcitx.py is a utility script, byte-compilation is useless.
-%exclude %{_datadir}/%{name}/tools/winmb2fcitx.pyc
-%exclude %{_datadir}/%{name}/tools/winmb2fcitx.pyo
%config %{_xinputconf}
%{_bindir}/*
%{_datadir}/%{name}
%{_datadir}/pixmaps/*
+%files libs
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/libfcitx*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%doc
+%{_libdir}/libfcitx*.so
+%{_libdir}/pkgconfig/fcitx*.pc
+%{_includedir}/fcitx*
+
%changelog
-* Tue Jul 20 2010 Chen Lei <supercyper at 163.com> - 3.6.3-6.20100602svn_utf8
-- svn 366
+* Fri Nov 19 2010 Chen Lei <supercyper at 163.com> - 4.0.0-1
+- Update to 4.0.0
* Mon Jun 14 2010 Chen Lei <supercyper at 163.com> - 3.6.3-5.20100514svn_utf8
- Remove BR:libXext-devel
diff --git a/sources b/sources
index 72ef4ba..2dfac8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f09b6c56eae10960004e7730ea18b35 fcitx-20100602.tar.bz2
+ce1156b19c719b04bd077f53fc4bd980 fcitx-4.0.0_all.tar.gz
diff --git a/xinput-fcitx b/xinput-fcitx
index 1a86b5a..1eb5a4d 100644
--- a/xinput-fcitx
+++ b/xinput-fcitx
@@ -2,6 +2,7 @@ XIM=fcitx
XIM_PROGRAM=/usr/bin/fcitx
ICON="/usr/share/pixmaps/fcitx.png"
XIM_ARGS="-D"
-SHORT_DESC="Fcitx"
+PREFERENCE_PROGRAM=/usr/bin/fcitx-config
+SHORT_DESC="FCITX"
GTK_IM_MODULE=xim
QT_IM_MODULE=xim
More information about the scm-commits
mailing list