[libkkc] Update to 0.3.1-2

[Daiki Ueno]

commit 4f13823a7cbc5c2f3d43de22a32a11387f92912e
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Fri Sep 20 12:24:59 2013 +0900

    Update to 0.3.1-2

 libkkc.spec |   28 ++++++----------------------
 sources     |    1 -
 2 files changed, 6 insertions(+), 23 deletions(-)
---
diff --git a/libkkc.spec b/libkkc.spec
index 25a9457..5e0c3c7 100644
--- a/libkkc.spec
+++ b/libkkc.spec
@@ -1,15 +1,14 @@
-%global dataversion 0.2.7
+%global dataversion 1:0.2.7
 
 Name:		libkkc
 Version:	0.3.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Japanese Kana Kanji conversion library
 
 License:	GPLv3+
 Group:		System Environment/Libraries
 URL:		https://bitbucket.org/libkkc
 Source0:	https://bitbucket.org/libkkc/libkkc/downloads/%{name}-%{version}.tar.gz
-Source1:	https://bitbucket.org/libkkc/libkkc-data/downloads/%{name}-data-%{dataversion}.tar.xz
 #Patch0:		libkkc-HEAD.patch
 
 BuildRequires:	marisa-devel
@@ -24,7 +23,7 @@ BuildRequires:	intltool
 BuildRequires:	python2-devel
 
 Requires:	skkdic
-Requires:	%{name}-data = %{version}-%{release}
+Requires:	%{name}-data >= %{dataversion}
 Requires:	%{name}-common = %{version}-%{release}
 
 %description
@@ -62,15 +61,6 @@ The %{name}-common package contains the arch-independent data that
 %{name} uses at run time.
 
 
-%package	data
-Summary:	Data files for %{name}
-BuildRequires:	marisa-python
-
-%description	data
-The %{name}-data package contains the language model data that %{name}
-uses at run time.
-
-
 %prep
 %setup -q
 #patch0 -p1 -b .HEAD
@@ -88,12 +78,6 @@ make check
 %install
 %make_install INSTALL="install -p"
 
-tar xf %{SOURCE1}
-pushd %{name}-data-%{dataversion}
-%configure
-%make_install INSTALL="install -p"
-popd
-
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %find_lang %{name}
@@ -112,9 +96,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %files common
 %{_datadir}/libkkc
 
-%files data
-%{_libdir}/libkkc
-
 %files devel
 %doc
 %{_includedir}/*
@@ -128,6 +109,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Fri Sep 20 2013 Daiki Ueno <dueno at redhat.com> - 0.3.1-2
+- drop -data subpackage, which is now split into a separate source package
+
 * Sun Sep 15 2013 Daiki Ueno <dueno at redhat.com> - 0.3.1-1
 - new upstreamm release
 - fix numeric conversion
diff --git a/sources b/sources
index 26fbf38..bc8619a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 2331c12cd1092fc8c4801979d11da48c  libkkc-0.3.1.tar.gz
-1ada8f434c3f642f457a7ac18fc3b554  libkkc-data-0.2.7.tar.xz