[sunpinyin] Upstream to the latest git snapshot of sunpinyin

[Liang Suilong]

commit fc0e3df2d67468512102ac8db543906818fb9f07
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Sun May 13 17:04:23 2012 +0800

    Upstream to the latest git snapshot of sunpinyin

 .gitignore           |    1 +
 make-git-snapshot.sh |   22 ++++++++++++++++++++++
 sources              |    6 +++---
 sunpinyin.spec       |   34 +++++++++++++++++++++-------------
 4 files changed, 47 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c3c137c..2e1fd0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /sunpinyin-all-in-one-2.0.3.tar.gz
 /lm_sc.t3g.arpa.tar.bz2
 /dict.utf8.tar.bz2
+/sunpinyin-20120513.tar.xz
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..b0d7dd6
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Usage: ./make-git-snapshot.sh [COMMIT]
+#
+# to make a snapshot of the given tag/branch.  Defaults to HEAD.
+# Point env var REF to a local mesa repo to reduce clone time.
+
+DIRNAME=sunpinyin-$( date +%Y%m%d )
+
+echo REF ${REF:+--reference $REF}
+echo DIRNAME $DIRNAME
+echo HEAD ${1:-HEAD}
+
+rm -rf $DIRNAME
+
+git clone ${REF:+--reference $REF} \
+	git://github.com/sunpinyin/sunpinyin.git $DIRNAME
+
+GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
+	| xz > $DIRNAME.tar.xz
+
+# rm -rf $DIRNAME
diff --git a/sources b/sources
index 718df4f..61dc3a9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-ffd79b94e88fc160bec7056d8e68d1c2  sunpinyin-all-in-one-2.0.3.tar.gz
-d75be3b5472cb06ad634261aa4aa22b5  lm_sc.t3g.arpa.tar.bz2
-7b996004c761f8a190a34df25d64668b  dict.utf8.tar.bz2
+67e470436e1fb43589e7ff253ef63285  sunpinyin-20120513.tar.xz
+31dd2667d9a5cae9d2ecdacf2201ab13  lm_sc.t3g.arpa.tar.bz2
+98b1dc61d3ef3fd4be3c0a9fac410da2  dict.utf8.tar.bz2
diff --git a/sunpinyin.spec b/sunpinyin.spec
index cdeaf76..7446829 100644
--- a/sunpinyin.spec
+++ b/sunpinyin.spec
@@ -1,23 +1,25 @@
 %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/xsunpinyin.conf
+%define gitdate 20120513
 
 Name:		sunpinyin
-Version:	2.0.3
-Release:	4%{?dist}
+Version:	2.0.4
+Release:	0.1%{?dist}
 Summary:	A statistical language model based Chinese input method engine
 Group:		System Environment/Libraries
 License:	LGPLv2 or CDDL
 URL:		http://code.google.com/p/sunpinyin/
-Source0:	http://sunpinyin.googlecode.com/files/%{name}-all-in-one-%{version}.tar.gz
+Source0:	%{name}-%{gitdate}.tar.xz
 Source1:	xinput-x%{name}
 Source2:	http://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2
 Source3:	http://open-gram.googlecode.com/files/dict.utf8.tar.bz2
-Patch0:         sunpinyin-fixes-unistd-compile.patch
+#Patch0:         sunpinyin-fixes-unistd-compile.patch
 BuildRequires:	sqlite-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	ibus-devel
 BuildRequires:	gettext	
 BuildRequires:	scons
-%ifarch %{ix86} x86_64 armv5tel mips64el
+BuildRequires:	python-devel
+%ifarch %{ix86} x86_64 armv5tel mips64el armv7hl
 Requires:	%{name}-data-le
 %else
 Requires:	%{name}-data-be
@@ -83,8 +85,8 @@ This package provides a XIM server with SunPinyin input method. It works much
 the same way as fcitx does.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .unistd
+%setup -q -n %{name}-%{gitdate}
+#%patch0 -p1 -b .unistd
 
 # Hack to honor correct compiler flags
 sed -i 's/-O2 -pipe/%{optflags}/' SConstruct
@@ -93,18 +95,18 @@ sed -i 's/-O2 -pipe/%{optflags}/' wrapper/{ibus,xim}/SConstruct
 # Fix libexecdir path for ibus-sunpinyin
 sed -i 's\lib/ibus-sunpinyin\libexec\' wrapper/ibus/SConstruct
 
-cp %SOURCE2 %{_builddir}/%{name}-%{version}/raw
-cp %SOURCE3 %{_builddir}/%{name}-%{version}/raw
+cp %SOURCE2 %{_builddir}/%{name}-%{gitdate}/raw
+cp %SOURCE3 %{_builddir}/%{name}-%{gitdate}/raw
 
 %build
 scons %{?_smp_mflags} --prefix=%{_prefix}
 
 # We need to do this so wrappers can link against libsunpinyin 
-sed -i 's\libdir=.*$\libdir=%{_builddir}/%{name}-%{version}\' sunpinyin-*.pc
-sed -i 's\includedir=.*$\includedir=%{_builddir}/%{name}-%{version}/src\' sunpinyin-*.pc
+sed -i 's\libdir=.*$\libdir=%{_builddir}/%{name}-%{gitdate}\' sunpinyin-*.pc
+sed -i 's\includedir=.*$\includedir=%{_builddir}/%{name}-%{gitdate}/src\' sunpinyin-*.pc
 cp -p sunpinyin-2.0.pc sunpinyin-2.0.pc.bak
 ln -s libsunpinyin*.so libsunpinyin.so
-export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{version}
+export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{gitdate}
 
 pushd wrapper/ibus
 scons %{?_smp_mflags} --prefix=%{_prefix}
@@ -127,7 +129,7 @@ sed -i 's\{exec_prefix}/lib\{exec_prefix}/%{_lib}\' \
 
 # Put them back so the install doesn't fail
 cp -p sunpinyin-2.0.pc.bak sunpinyin-2.0.pc
-export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{version}
+export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{gitdate}
 
 pushd wrapper/ibus
 scons %{?_smp_mflags} --prefix=%{_prefix} install --install-sandbox=%{buildroot}
@@ -196,6 +198,12 @@ fi
 %config %{_xinputconf}
 
 %changelog
+* Sun May 13 2012 Liang Suilong <liangsuilong at gmail.com> - 2.0.4-0.1
+- Upstream to the latest git snapshot
+- Add BR: python-devel
+- Upgrade to the latest SLM Data
+- Drop the patch: sunpinyin-fixes-unistd-compile.patch
+
 * Tue Mar 06 2012  Peng Wu <pwu at redhat.com> - 2.0.3-4
 - Rebuilt for ibus-1.4.99