Update to svn 365

This commit is contained in:
supercyper 2010-05-16 02:25:09 +00:00
parent 594f5a2cfc
commit 44800cf2ba
4 changed files with 28 additions and 28 deletions

View File

@ -1 +1,2 @@
fcitx-20100410.tar.bz2
fcitx-20100514.tar.bz2

View File

@ -1,17 +1,14 @@
%define svndate 20100410
%define svnver 350
%define svndate 20100514
%define svnver 365
%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf
Name: fcitx
Summary: Free Chinese Input Toy for X (XIM)
Version: 3.6.3
Release: 3.%{?svndate}svn_utf8%{?dist}
# fcitx itself is licensed under GPLv2+
# lib/*, /src/IC.c and /src/IC.h are licensed under MIT
# src/uthash.h is licensed under BSD
License: GPLv2+ and MIT and BSD
Group: System Environment/Libraries
URL: http://code.google.com/p/%{name}/
Name: fcitx
Summary: Free Chinese Input Toy for X (XIM)
Version: 3.6.3
Release: 4.%{?svndate}svn_utf8%{?dist}
License: GPLv2+
Group: System Environment/Libraries
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
@ -22,17 +19,17 @@ URL: http://code.google.com/p/%{name}/
# 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
Source1: xinput-%{name}
BuildRequires: autoconf automake
BuildRequires: gettext-devel
BuildRequires: libXtst-devel
BuildRequires: libXft-devel
BuildRequires: libXpm-devel
BuildRequires: libXext-devel
BuildRequires: dbus-devel
Requires: im-chooser
Requires(post): %{_sbindir}/alternatives
Source0: %{name}-%{svndate}.tar.bz2
Source1: xinput-%{name}
BuildRequires: autoconf automake
BuildRequires: gettext-devel
BuildRequires: libXtst-devel
BuildRequires: libXft-devel
BuildRequires: libXpm-devel
BuildRequires: libXext-devel
BuildRequires: dbus-devel
Requires: im-chooser
Requires(post): %{_sbindir}/alternatives
Requires(postun): %{_sbindir}/alternatives
%description
@ -47,7 +44,7 @@ This package is the UTF-8 branch of fcitx.
%build
# fix DSOLinking
sed -i -e 's/fcitx_LDFLAGS =/fcitx_LDFLAGS = -ldl -lXext/g' src/Makefile.am
sed -i -e 's/fcitx_LDFLAGS =/fcitx_LDFLAGS = -ldl -lXext/g' src/core/Makefile.am
./autogen.sh
%configure --enable-dbus
make %{?_smp_mflags}
@ -85,17 +82,18 @@ fi
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING THANKS TODO
%doc __doc/*
%exclude %{_datadir}/%{name}/data/*.txt
%exclude %{_datadir}/%{name}/data/*.org
%exclude %{_datadir}/%{name}/xpm/*.xpm
# 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/*
%changelog
* Fri May 14 2010 Chen Lei <supercyper@163.com> - 3.6.3-4.20100514svn_utf8
- svn 365
* Sun Apr 18 2010 Chen Lei <supercyper@163.com> - 3.6.3-3.20100410svn_utf8
- Exclude xpm files

View File

@ -1 +1,2 @@
b2f08f13936566ec09a1c3ee5a908b64 fcitx-20100410.tar.bz2
f95e24c760777dc85cafb2772f76a950 fcitx-20100514.tar.bz2

View File

@ -1,6 +1,6 @@
XIM=fcitx
XIM_PROGRAM=/usr/bin/fcitx
ICON="/usr/share/fcitx/xpm/Logo.png"
ICON="/usr/share/pixmaps/fcitx.png"
XIM_ARGS="-D"
SHORT_DESC="Fcitx"
GTK_IM_MODULE=xim