[fcitx/f13/master] Upgrade to FCITX 4.0.1

[Liang Suilong]

commit 2a8013bb9d26d447751875b2a125c8d784d79936
Author: Fedora <liangsuilong at gmail.com>
Date:   Fri Dec 17 20:50:55 2010 +0800

    Upgrade to FCITX 4.0.1

 .gitignore   |    1 +
 fcitx.spec   |   83 ----------------------------------------------------------
 sources      |    2 -
 xinput-fcitx |    4 ---
 4 files changed, 1 insertions(+), 89 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..68bc500
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/fcitx-4.0.1_all.tar.gz
diff --git a/fcitx.spec b/fcitx.spec
index 5f10866..40e6ae9 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -1,68 +1,7 @@
-<<<<<<< HEAD
-%define svndate 20100602
-%define svnver 366
-=======
->>>>>>> master
 %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/fcitx.conf
 
 Name:			fcitx
 Summary:		Free Chinese Input Toy for X (XIM)
-<<<<<<< HEAD
-Version:		3.6.3
-Release:		6.%{?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
-# 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
-Source1:		xinput-%{name}
-BuildRequires:		autoconf automake
-BuildRequires:		gettext-devel
-BuildRequires:		libXtst-devel
-BuildRequires:		libXft-devel 
-BuildRequires:		libXpm-devel
-BuildRequires:		dbus-devel
-Requires:		im-chooser
-Requires(post):		%{_sbindir}/alternatives
-Requires(postun):	%{_sbindir}/alternatives
-
-%description
-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.
-
-%prep
-%setup -q -n %{name}-%{svndate}
-
-%build
-# fix DSOLinking
-sed -i -e 's/fcitx_LDFLAGS =/fcitx_LDFLAGS = -ldl/g' src/core/Makefile.am
-./autogen.sh
-%configure --enable-dbus
-make %{?_smp_mflags}
-
-%install
-rm -rf %{buildroot}
-
-make install INSTALL="install -p" DESTDIR=%{buildroot}
-
-#fix doc path
-mkdir __doc
-mv %{buildroot}%{_datadir}/%{name}/doc/* __doc
-rm -rf %{buildroot}%{_datadir}/%{name}/doc
-rm -f __doc/{API.txt,Develop_Readme*,fcitx_trunk.doxyfile}
-=======
 Version:		4.0.1
 Release:		1%{?dist}
 License:		GPLv2+
@@ -120,16 +59,11 @@ chrpath --delete %{buildroot}%{_bindir}/{*PYMB,mb2org,fcitx,readPYBase}
 #mv %{buildroot}%{_datadir}/%{name}/doc/* __doc
 #rm -rf %{buildroot}%{_datadir}/%{name}/doc
 #rm -f __doc/{API.txt,Develop_Readme*,fcitx_trunk.doxyfile}
->>>>>>> master
 
 # install xinput config file
 install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf}
 
-<<<<<<< HEAD
-chmod 0755 %{buildroot}%{_datadir}/%{name}/tools/winmb2fcitx.py
-=======
 %find_lang %{name}
->>>>>>> master
 
 %clean
 rm -rf %{buildroot}
@@ -144,15 +78,6 @@ if [ "$1" = "0" ]; then
   [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
 fi
 
-<<<<<<< HEAD
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING 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
-=======
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -161,17 +86,10 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog THANKS TODO 
 #%doc __doc/*
->>>>>>> master
 %config %{_xinputconf}
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
-<<<<<<< HEAD
-
-%changelog
-* Tue Jul 20 2010 Chen Lei <supercyper at 163.com> - 3.6.3-6.20100602svn_utf8
-- svn 366
-=======
 %{_datadir}/applications/%{name}-configtool.desktop
 %{_datadir}/applications/%{name}.desktop
 %{_docdir}/%{name}/
@@ -204,7 +122,6 @@ fi
 
 * Fri Nov 19 2010 Chen Lei <supercyper at 163.com> - 4.0.0-1
 - Update to 4.0.0
->>>>>>> master
 
 * 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 216175e..d3ca6de 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-ce1156b19c719b04bd077f53fc4bd980  fcitx-4.0.0_all.tar.gz
 844f6a382ca970d6c3343e12148be641  fcitx-4.0.1_all.tar.gz
-
diff --git a/xinput-fcitx b/xinput-fcitx
index 1aef148..1eb5a4d 100644
--- a/xinput-fcitx
+++ b/xinput-fcitx
@@ -2,11 +2,7 @@ XIM=fcitx
 XIM_PROGRAM=/usr/bin/fcitx
 ICON="/usr/share/pixmaps/fcitx.png"
 XIM_ARGS="-D"
-<<<<<<< HEAD
-SHORT_DESC="Fcitx"
-=======
 PREFERENCE_PROGRAM=/usr/bin/fcitx-config
 SHORT_DESC="FCITX"
->>>>>>> master
 GTK_IM_MODULE=xim
 QT_IM_MODULE=xim