From e61b384a9c2c58500f8b2578d1a3b0a6d22a9d77 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Thu, 12 Jun 2014 17:17:06 +1000
Subject: [PATCH] Upstream Update to 0.4.0

---
 .gitignore      |  1 +
 libchewing.spec | 29 +++++++++++++++++++++--------
 sources         |  2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1751683..ed208d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ libchewing-0.3.2.tar.bz2
 /libchewing-0.3.4.tsiMissing.patch
 /libchewing.spec
 /libchewing-0.3.5.tar.bz2
+/v0.4.0.tar.gz
diff --git a/libchewing.spec b/libchewing.spec
index c9b0f5a..9cc8afc 100644
--- a/libchewing.spec
+++ b/libchewing.spec
@@ -5,18 +5,25 @@
 %global name_zh_TW %{im_name_zh_TW}函式庫
 
 Name:           libchewing
+<<<<<<< HEAD
 Version:        0.3.5
 Release:        3%{?dist}
+=======
+Version:        0.4.0
+Release:        1%{?dist}
+>>>>>>> Upstream Update to 0.4.0
 Summary:        Intelligent phonetic input method library for Traditional Chinese
 Summary(zh_TW): %{name_zh_TW}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://chewing.csie.net/
-Source0:        http://chewing.googlecode.com/files/%{name}-%{version}.tar.bz2
-Source1:         https://raw.github.com/chewing/%{name}/v%{version}/contrib/python/chewing.py
+Source0:        https://github.com/chewing/%{name}/archive/v%{version}.tar.gz
+Source1:         https://raw.githubusercontent.com/chewing/%{name}/v%{version}/contrib/python/chewing.py
 
-BuildRequires:  autoconf automake libtool pkgconfig texinfo
+BuildRequires:  autoconf automake libtool pkgconfig texinfo 
+BuildRequires:  sqlite-devel
+Requires: sqlite
 Requires(post): info
 Requires(preun): info
 
@@ -75,7 +82,7 @@ make V=1 RPM_CFLAGS="%{optflags}" %{_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install INSTALL="install -p"
-rm %{buildroot}%{_libdir}/libchewing.la
+rm -f %{buildroot}%{_libdir}/libchewing.la
 
 mkdir -p %{buildroot}%{libchewing_python_dir}
 cp -p contrib/python/chewing.py %{buildroot}%{libchewing_python_dir}
@@ -85,6 +92,7 @@ touch %{buildroot}%{libchewing_python_dir}/__init__.py
 
 rm -f %{buildroot}/%{_infodir}/dir
 
+
 %post
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
@@ -99,11 +107,11 @@ fi
 %clean
 
 %files
-%doc README AUTHORS COPYING
-%dir %{_libdir}/libchewing
-%{_libdir}/libchewing/*
+%doc README.md AUTHORS COPYING NEWS TODO
+%{_datadir}/%{name}/*
+			
 %{_libdir}/*.so.*
-%{_infodir}/libchewing.info.gz
+%{_infodir}/%{name}.info.gz
 
 %files devel
 %dir %{_includedir}/chewing
@@ -115,6 +123,11 @@ fi
 %{libchewing_python_dir}
 
 %changelog
+* Tue Jun 10 2014 Ding-Yi Chen <dchen at redhat dot com> - 0.4.0-1
+- Upstream update to 0.4.0
+  Details: https://github.com/chewing/libchewing/releases/tag/v0.4.0
+- Update the URL for Sources.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index d5f2dd7..f446dbb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfc5c3d16eeeb13d68d741453efd9712  libchewing-0.3.5.tar.bz2
+2537d7c7b890973c594bac6c598f20bc  v0.4.0.tar.gz