diff --git a/ruby.changes b/ruby.changes index deaf62e..aaf646a 100644 --- a/ruby.changes +++ b/ruby.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 8 20:06:35 UTC 2014 - kkaempf@suse.com + +- Add gem_* to ruby.macros + +------------------------------------------------------------------- +Mon Jan 6 16:39:40 UTC 2014 - coolo@suse.com + +- switch to ruby 2.1 + ------------------------------------------------------------------- Mon Jan 6 08:25:55 UTC 2014 - coolo@suse.com diff --git a/ruby.macros b/ruby.macros index 0505800..7892923 100644 --- a/ruby.macros +++ b/ruby.macros @@ -1,5 +1,5 @@ # -# Copyright (c) 2012 SUSE Linux +# Copyright (c) 2014 SUSE Linux # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -21,28 +21,33 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -%rb_binary %{rb20_binary} -%gem_binary /usr/bin/gem2.0 -%rb_arch %{rb20_arch} -%rb_ver %{rb20_ver} +%rb_binary %{rb21_binary} +%gem_binary /usr/bin/gem2.1 +%rb_arch %{rb21_arch} +%rb_ver %{rb21_ver} -%rb_dir %{rb20_dir} -%rb_libdir %{rb20_libdir} -%rb_archdir %{rb20_archdir} +%rb_dir %{rb21_dir} +%rb_libdir %{rb21_libdir} +%rb_archdir %{rb21_archdir} -%rb_sitedir %rb20_sitedir -%rb_sitelibdir %rb20_sitelibdir -%rb_sitearchdir %rb20_sitearchdir +%rb_sitedir %rb21_sitedir +%rb_sitelibdir %rb21_sitelibdir +%rb_sitearchdir %rb21_sitearchdir -%rb_vendordir %rb20_vendordir -%rb_vendorlibdir %rb20_vendorlibdir -%rb_vendorarchdir %rb20_vendorarchdir +%rb_vendordir %rb21_vendordir +%rb_vendorlibdir %rb21_vendorlibdir +%rb_vendorarchdir %rb21_vendorarchdir # old names -%rb_sitelib %rb20_sitelibdir -%rb_sitearch %rb20_sitearchdir +%rb_sitelib %rb21_sitelibdir +%rb_sitearch %rb21_sitearchdir # -%rb_vendorlib %rb20_vendorlibdir -%rb_vendorarch %rb20_vendorarchdir +%rb_vendorlib %rb21_vendorlibdir +%rb_vendorarch %rb21_vendorarchdir +# gem names +%gem_base %gem21_base +%gem_extensions %gem21_extensions +%gem_doc_ext %gem21_doc_ext +%gem_platform %gem21_platform diff --git a/ruby.spec b/ruby.spec index a30b449..2e08d8d 100644 --- a/ruby.spec +++ b/ruby.spec @@ -17,7 +17,7 @@ Name: ruby -Version: 2.0 +Version: 2.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: ruby.macros @@ -28,15 +28,15 @@ Summary: An Interpreted Object-Oriented Scripting Language License: MIT Group: Development/Languages/Ruby BuildRequires: ruby-common -BuildRequires: ruby20-devel +BuildRequires: ruby21-devel BuildRequires: update-alternatives #!BuildIgnore: ruby ruby-devel #!BuildIgnore: rubygems -%requires_ge ruby20 +%requires_ge ruby21 Provides: rubygems = 1.8.15 Obsoletes: rubygems < 1.8.15 -%{expand:%(rpm -ql ruby20 | fgrep .gemspec | /usr/bin/ruby2.0 /usr/lib/rpm/rubygemsdeps.rb --provides | sed -e 's,^,Provides:,')} +%{expand:%(rpm -ql ruby21 | fgrep .gemspec | /usr/bin/ruby2.1 /usr/lib/rpm/rubygemsdeps.rb --provides | sed -e 's,^,Provides:,')} %description Ruby is an interpreted scripting language for quick and easy @@ -71,7 +71,7 @@ BeOS, and more) Summary: Development files to link against Ruby Group: Development/Languages/Ruby Requires: %{name} -Requires: ruby20-devel +Requires: ruby21-devel Provides: rubygems_with_buildroot_patch %description devel @@ -83,7 +83,7 @@ Development files to link against Ruby. %install mkdir -p %{buildroot}%_libdir -ln -s %_libdir/libruby2.0.so %{buildroot}%_libdir/libruby.so +ln -s %_libdir/libruby2.1.so %{buildroot}%_libdir/libruby.so install -D -m 0644 %{S:0} %{buildroot}/etc/rpm/macros.ruby install -D -m 0644 %{S:2} %{buildroot}/etc/gemrc