ruby: fix macros.ruby

others: rebuild with ruby-2.0.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8029 ec354946-7b23-47d6-9f5a-488ba84defc7

r/rcairo/rcairo-vl.spec

@@ -5,7 +5,7 @@ Summary:     Ruby binding for cairo
 Summary(ja): cairo の Ruby バインディング
 Name:        rcairo
 Version:     1.12.6
-Release:     1%{?_dist_release}
+Release:     2%{?_dist_release}
 Source0:     http://cairographics.org/releases/%{name}-%{version}.tar.gz
 License:     The same conditions as ruby
 Group:       System Environment/Libraries
@@ -51,7 +51,7 @@ rcairo を用いた開発用のヘッダーファイル
 %setup -q
 
 %build
-%ruby ./extconf.rb
+%ruby extconf.rb
 %{__make}
 
 %install
@@ -73,6 +73,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{rarchdir}/*.h
 
 %changelog
+* Sat Dec 07 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.6-2
+- rebuild with ruby-2.0.0.353
+
 * Sat Sep 21 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.6-1
 - new upstream release
 

r/ruby-gnome2/ruby-gnome2-vl.spec

@@ -7,7 +7,7 @@ Summary:     language bindings for GNOME2 and GNOME3 for use with Ruby
 Summary(ja): Ruby から GNOME2 及び GNOME3 を使う為のライブラリ
 Name:        ruby-gnome2
 Version:     2.0.2
-Release:     2%{?_dist_release}
+Release:     3%{?_dist_release}
 Group:       Development/Libraries
 License:     GPL
 URL:         http://ruby-gnome2.sourceforge.net/
@@ -45,7 +45,7 @@ Obsoletes: ruby-glade2 < 2.0.0
 
 %description
 This is a set of bindings for the GNOME-2.x and GNOME-3.x libraries to
-use from Ruby 1.9.x.
+use from Ruby 2.0.x.
 
 
 %package -n ruby-gtk2
@@ -305,6 +305,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 07 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.2-3
+- rebuild with ruby-2.0.0.353
+
 * Sat Oct 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.2-2
 - rebuild with poppler-0.24.2
 

r/ruby-pkg-config/ruby-pkg-config-vl.spec

@@ -1,6 +1,6 @@
 %define origname pkg-config
 %define ver 1.1.4
-%define rel 1
+%define rel 2
 
 Summary: a pkg-config implementation by Ruby
 Summary(ja): Ruby のために実装された pkg-config
@@ -46,6 +46,9 @@ A pkg-config implementation by Ruby.
 
 
 %changelog
+* Sat Dec 07 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.1.4-2
+- rebuild with ruby-2.0.0.353
+
 * Sun Jan 13 2013 IWAI, Masaharu <iwai@alib.jp> 1.1.4-1
 - initial build for Vine Linux
 

r/ruby/ruby-vl.spec

@@ -55,7 +55,7 @@
 # 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 1
+%global ruby_rel 2
 
 %bcond_without emacsen
 %define rbmode          ruby-mode
@@ -523,19 +523,19 @@ cp misc/*.el %{SOURCE8} $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/%{rbmode}
 # Dump the macros into macro.ruby to use them to build other Ruby libraries.
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat >> %{buildroot}%{_sysconfdir}/rpm/macros.ruby << \EOF
-%%ruby_libdir %%{_datadir}/%{name}
-%%ruby_libarchdir %%{_libdir}/%{name}
+%%ruby_libdir %%{_datadir}/%{name}/%{ruby_release}
+%%ruby_libarchdir %%{_libdir}/%{name}/%{ruby_release}
 
 # This is the local lib/arch and should not be used for packaging.
 %%ruby_sitedir site_ruby
-%%ruby_sitelibdir %%{_prefix}/local/share/%{name}/%%{ruby_sitedir}
-%%ruby_sitearchdir %%{_prefix}/local/%%{_lib}/%{name}/%%{ruby_sitedir}
+%%ruby_sitelibdir %%{_prefix}/local/share/%{name}/%%{ruby_sitedir}/%{ruby_release}
+%%ruby_sitearchdir %%{_prefix}/local/%%{_lib}/%{name}/%%{ruby_sitedir}/%{ruby_release}
 
 # This is the general location for libs/archs compatible with all
 # or most of the Ruby versions
 %%ruby_vendordir vendor_ruby
-%%ruby_vendorlibdir %%{_datadir}/%{name}/%%{ruby_vendordir}
-%%ruby_vendorarchdir %%{_libdir}/%{name}/%%{ruby_vendordir}
+%%ruby_vendorlibdir %%{_datadir}/%{name}/%%{ruby_vendordir}/%{ruby_release}
+%%ruby_vendorarchdir %%{_libdir}/%{name}/%%{ruby_vendordir}/%{ruby_release}
 EOF
 
 cat >> %{buildroot}%{_sysconfdir}/rpm/macros.rubygems << \EOF
@@ -980,6 +980,9 @@ fi
 %endif
 
 %changelog
+* Sat Dec 07 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.0.353-2
+- fix macros.ruby
+
 * Tue Dec 03 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.0.353-1
 - update to 2.0.0-p353
 - change ruby(abi) -> ruby(release)