[skf] 1.99.0

[Mamoru Tasaka]

commit 9ccbb91fdfd357c6fc9835a7c376e0e7b202678a
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Mon Apr 2 17:42:04 2012 +0900

    1.99.0

 .gitignore        |    1 +
 skf-basic-test.sh |   14 ++++++++------
 skf.spec          |   30 ++++++++++++++++--------------
 sources           |    2 +-
 4 files changed, 26 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c9b7f02..b84e109 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ skf_1.97.2.tar.gz
 /skf_1.97.3.tar.gz
 /skf_1.97.4.tar.gz
 /skf_1.99a1g.tar.gz
+/skf_1.99.0.tar.gz
diff --git a/skf-basic-test.sh b/skf-basic-test.sh
index 5ad5336..b2811c0 100644
--- a/skf-basic-test.sh
+++ b/skf-basic-test.sh
@@ -45,9 +45,9 @@ fi
 
 # perl
 echo "Checking perl"
-a_from_shift_jis=$(perl -e "use Skf ; print Skf::convert('-s', \"$a_eucjp\")" | iconv -f shift-jis -t utf-8)
-a_from_iso=$(perl -e "use Skf ; print Skf::convert('--oc=iso-2022-jp', \"$a_eucjp\")" | iconv -f iso-2022-jp -t utf-8)
-a_from_utf8=$(perl -e "use Skf ; print Skf::convert('-z', \"$a_eucjp\")")
+a_from_shift_jis=$(perl -e "use skf ; print skf::convert('-s', \"$a_eucjp\")" | iconv -f shift-jis -t utf-8)
+a_from_iso=$(perl -e "use skf ; print skf::convert('--oc=iso-2022-jp', \"$a_eucjp\")" | iconv -f iso-2022-jp -t utf-8)
+a_from_utf8=$(perl -e "use skf ; print skf::convert('-z', \"$a_eucjp\")")
 
 if [ "$a_from_shift_jis" != "$a_utf8" ] ; then exit 1 ; fi
 if [ "$a_from_iso" != "$a_utf8" ] ; then exit 1 ; fi
@@ -58,9 +58,11 @@ if [ "$a_from_utf8" != "$a_utf8" ] ; then exit 1 ; fi
 echo "Checking ruby"
 ruby -e 'puts $:'
 
-a_from_shift_jis=$(ruby -e "require 'skf' ; puts Skf.convert('-s', \"$a_eucjp\")" | iconv -f shift-jis -t utf-8)
-a_from_iso=$(ruby -e "require 'skf' ; puts Skf.convert('--oc=iso-2022-jp', \"$a_eucjp\")" | iconv -f iso-2022-jp -t utf-8)
-a_from_utf8=$(ruby -e "require 'skf' ; puts Skf.convert('-z', \"$a_eucjp\")")
+a_eucjp_arr='[0xa4, 0xa2]'
+
+a_from_shift_jis=$(ruby -e "require 'skf' ; puts Skf.convert('-s', $a_eucjp_arr.pack(\"C*\"))" | iconv -f shift-jis -t utf-8)
+a_from_iso=$(ruby -e "require 'skf' ; puts Skf.convert('--oc=iso-2022-jp', $a_eucjp_arr.pack(\"C*\"))" | iconv -f iso-2022-jp -t utf-8)
+a_from_utf8=$(ruby -e "require 'skf' ; puts Skf.convert('-z', $a_eucjp_arr.pack(\"C*\"))")
 
 if [ "$a_from_shift_jis" != "$a_utf8" ] ; then exit 1 ; fi
 if [ "$a_from_iso" != "$a_utf8" ] ; then exit 1 ; fi
diff --git a/skf.spec b/skf.spec
index 24b3553..9980908 100644
--- a/skf.spec
+++ b/skf.spec
@@ -1,14 +1,13 @@
-%global	rubyabi	1.8
-%global	ruby_sitearch	%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+%global	rubyabi	1.9.1
 
 %{!?python_sitearch:	%global	python_sitearch	%(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
-%global	repoid		51361
+%global	repoid		55295
 
-%global	mainver	1.99
-%global	betaver	a1g
+%global	mainver	1.99.0
+%undefine	betaver	
 
-%global	fedoraver	2
+%global	fedoraver	1
 
 %global	enable_python3	0
 %if 0%{?fedora} >= 13
@@ -158,7 +157,7 @@ OPTS=""
 OPTS="$OPTS --enable-debug"
 OPTS="$OPTS --disable-strip"
 
-OPTS="$OPTS --with-ruby_sitearch_dir=%{ruby_sitearch}"
+OPTS="$OPTS --enable-ruby19 --with-ruby_sitearch_dir=%{ruby_vendorarchdir}"
 PYTHONOPTS="$OPTS --with-python_sitearch_dir=%{python_sitearch}"
 %if %enable_python3
 PYTHON3OPTS="$OPTS --enable-python3 --with-python_sitearch_dir=%{python3_sitearch}"
@@ -248,9 +247,9 @@ done
 
 ## perl
 pushd perl
-mkdir -p %{buildroot}%{perl_vendorarch}/auto/Skf
-install -cpm 0644 Skf.pm %{buildroot}%{perl_vendorarch}
-install -cpm 0755 skf.so %{buildroot}%{perl_vendorarch}/auto/Skf/Skf.so
+mkdir -p %{buildroot}%{perl_vendorarch}/auto/skf
+install -cpm 0644 skf.pm %{buildroot}%{perl_vendorarch}
+install -cpm 0755 skf.so %{buildroot}%{perl_vendorarch}/auto/skf/skf.so
 popd
 
 ## Cleanup
@@ -267,7 +266,7 @@ export python2PATH=%{buildroot}%{python_sitearch}
 %if %enable_python3
 export python3PATH=%{buildroot}%{python3_sitearch}
 %endif
-export RUBYLIB=%{buildroot}%{ruby_sitearch}
+export RUBYLIB=%{buildroot}%{ruby_vendorarchdir}
 
 # SOURCE1
 sh skf-basic-test.sh
@@ -293,7 +292,7 @@ rm -rf %{buildroot}
 
 %files	ruby
 %defattr(-,root,root,-)
-%{ruby_sitearch}/skf.so
+%{ruby_vendorarchdir}/skf.so
 
 %files	python
 %defattr(-,root,root,-)
@@ -309,10 +308,13 @@ rm -rf %{buildroot}
 
 %files	perl
 %defattr(-,root,root,-)
-%{perl_vendorarch}/Skf.pm
-%{perl_vendorarch}/auto/Skf/
+%{perl_vendorarch}/skf.pm
+%{perl_vendorarch}/auto/skf/
 
 %changelog
+* Mon Apr  2 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.99.0-1
+- 1.99.0
+
 * Thu Jan  5 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.99-0.2.alg
 - F-17: rebuild against gcc47
 
diff --git a/sources b/sources
index ab2d094..a09564c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0950260036d3290cab0c6cc948dad6ac  skf_1.99a1g.tar.gz
+74913f02fd35702e2f7c8772e48dc73e  skf_1.99.0.tar.gz