|
|
@@ -54,7 +54,8 @@
|
|
|
# we cannot reset the release number to 1 even when the main (ruby) version
|
|
|
# is updated - because it may be that the versions of sub-components don't
|
|
|
# change.
|
|
|
-%global ruby_rel 7
|
|
|
+# rubyのmainバージョンが更新されても1には戻さずに必ず+1してください。
|
|
|
+%global ruby_rel 8
|
|
|
|
|
|
%bcond_without emacsen
|
|
|
%define rbmode ruby-mode
|
|
|
@@ -120,7 +121,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: autoconf
|
|
|
BuildRequires: gdbm-devel
|
|
|
BuildRequires: ncurses-devel
|
|
|
-BuildRequires: db4-devel
|
|
|
+BuildRequires: libdb-devel
|
|
|
BuildRequires: libffi-devel
|
|
|
BuildRequires: openssl-devel
|
|
|
BuildRequires: libyaml-devel
|
|
|
@@ -274,6 +275,7 @@ License: GPLv2 and Ruby and MIT
|
|
|
Requires: ruby(release) = %{ruby_release}
|
|
|
Requires: ruby(rubygems) >= %{rubygems_version}
|
|
|
Requires: ruby(irb) = %{irb_version}
|
|
|
+Requires: rubygem(json) = %{json_version}
|
|
|
Provides: rdoc = %{version}-%{release}
|
|
|
Provides: ri = %{version}-%{release}
|
|
|
Provides: rubygem(rdoc) = %{version}-%{release}
|
|
|
@@ -577,7 +579,7 @@ ln -s %{gem_dir}/%{ruby_release}/gems/json-%{json_version}/lib/json %{buildroot}
|
|
|
# gem_extdir
|
|
|
mkdir -p %{buildroot}%{gem_extdir}/%{ruby_release}/exts/json-%{json_version}/lib
|
|
|
mv %{buildroot}%{ruby_libarchdir}/%{ruby_release}/json/ %{buildroot}%{gem_extdir}/%{ruby_release}/exts/json-%{json_version}/lib/
|
|
|
-ln -s %{gem_extdir}/%{ruby_release}/exts/json-%{json_version}/lib/json.so %{buildroot}%{ruby_libarchdir}/%{ruby_release}/json.so
|
|
|
+ln -s %{gem_extdir}/%{ruby_release}/exts/json-%{json_version}/lib/json %{buildroot}%{ruby_libarchdir}/%{ruby_release}/json
|
|
|
mv %{buildroot}%{gem_dir}/%{ruby_release}/specifications/default/json-%{json_version}.gemspec %{buildroot}%{gem_dir}/%{ruby_release}/specifications
|
|
|
|
|
|
## minitest
|
|
|
@@ -919,10 +921,11 @@ fi
|
|
|
|
|
|
%files -n rubygem-json
|
|
|
%{ruby_libdir}/%{ruby_release}/json
|
|
|
-%{ruby_libarchdir}/%{ruby_release}/json.so
|
|
|
+%{ruby_libarchdir}/%{ruby_release}/json
|
|
|
%{gem_extdir}/%{ruby_release}/exts/json-%{json_version}
|
|
|
%{gem_dir}/%{ruby_release}/gems/json-%{json_version}
|
|
|
%{gem_dir}/%{ruby_release}/specifications/json-%{json_version}.gemspec
|
|
|
+%{ruby_libarchdir}/%{ruby_release}/json
|
|
|
|
|
|
%files -n rubygem-minitest
|
|
|
%{ruby_libdir}/%{ruby_release}/minitest
|
|
|
@@ -956,6 +959,10 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jul 12 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.1.2-8
|
|
|
+- add R: rubygem(json) to rubygem-rdoc
|
|
|
+- fix json ext module path
|
|
|
+
|
|
|
* Sun Jul 06 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.2-7
|
|
|
- rebuild with libffi-3.0.13
|
|
|
|
daisuke