[skf] 2.00b0-0

[Mamoru TASAKA]

commit a3a60d1b990c18b4716dc0e588ffe00c137bcb5b
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Sun Jan 4 00:29:05 2015 +0900

    2.00b0-0

 .gitignore |    1 +
 skf.spec   |   29 +++++++++++++++++------------
 sources    |    2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d091ea9..e129f0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ skf_1.97.2.tar.gz
 /skf_1.99.8.tar.gz
 /skf_1.99.9.tar.gz
 /skf_1.99.10.tar.gz
+/skf-2.00b0-0.tar.gz
diff --git a/skf.spec b/skf.spec
index c97b7a0..6dae40a 100644
--- a/skf.spec
+++ b/skf.spec
@@ -7,11 +7,11 @@
 
 %{!?python_sitearch:	%global	python_sitearch	%(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
-%global	repoid		62262
+%global	repoid		62510
 
-%global	mainver	1.99.10
-#%%define	betaver	-cvs20130327T1317
-%define	betarel	%(echo %betaver | sed -e 's|-||')
+%global	mainver	2.00
+%define	betaver	b0-0
+%define	betarel	%(echo %betaver | sed -e 's|-|_|')
 
 %global	fedoraver	1
 
@@ -30,7 +30,7 @@ Summary:	Utility binary files in Simple Kanji Filter
 Group:		Applications/Text
 License:	BSD and MIT and UCD
 URL:		http://sourceforge.jp/projects/skf/
-Source0:	http://dl.sourceforge.jp/skf/%{repoid}/skf_%{mainver}%{?betaver}.tar.gz
+Source0:	http://dl.sourceforge.jp/skf/%{repoid}/skf-%{mainver}%{?betaver}.tar.gz
 Source1:	skf-basic-test.sh
 Source2:	create-skf-tarball-from-scm.sh
 
@@ -182,13 +182,9 @@ OPTS=""
 OPTS="$OPTS --enable-debug"
 OPTS="$OPTS --disable-strip"
 
-%if 0%{?fedora} >= 19
-OPTS="$OPTS --enable-ruby20 --with-ruby_sitearch_dir=%{ruby_vendorarchdir}"
-%else
-OPTS="$OPTS --enable-ruby19 --with-ruby_sitearch_dir=%{ruby_vendorarchdir}"
-%endif
+OPTS="$OPTS --with-ruby_sitearch_dir=%{ruby_vendorarchdir}"
 
-PYTHONOPTS="$OPTS --with-python_sitearch_dir=%{python_sitearch}"
+PYTHONOPTS="$OPTS --with-python_sitearch_dir=%{python2_sitearch}"
 %if %enable_python3
 PYTHON3OPTS="$OPTS --enable-python3 --with-python_sitearch_dir=%{python3_sitearch}"
 %endif
@@ -205,10 +201,16 @@ for ext in \
 do
 	pushd $ext
 
-    if [ $ext = ruby ] ; then
+    if [ $ext == ruby ] ; then
         export CFLAGS="%optflags $(pkg-config --cflags ruby)"
     fi
 
+# python2 fix
+# Need reporting
+	if [ $ext == python ] ; then
+		sed -i -e 's|Py_SKFSTR|char|' Makefile.in
+	fi
+
 	%configure $OPTS $PYTHONOPTS
 	unset CFLAGS
 	make -j1 ${ext}ext
@@ -374,6 +376,9 @@ rm -rf %{buildroot}
 %{perl_vendorarch}/auto/skf/
 
 %changelog
+* Sun Jan  5 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.00-0.1.b0_0
+- 2.00b0-0
+
 * Sun Nov 23 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.99.10-1
 - 1.99.10
 
diff --git a/sources b/sources
index 7ce6570..8214cdd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0fc3b832d1555b21689d2e13f0d4528f  skf_1.99.10.tar.gz
+8a0045ce7d244c27208a50645f08b22c  skf-2.00b0-0.tar.gz