pool/ruby
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 173679 from devel:languages:ruby

Browse Source 
- switch to ruby 2.0 default

OBS-URL: https://build.opensuse.org/request/show/173679
OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby?expand=0&rev=57
This commit is contained in:
Klaus Kämpf 2013-05-02 07:41:27 +00:00 committed by Git OBS Bridge
parent 64cc6ac89f
commit bfc2c80d6f
3 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruby.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Apr 27 16:25:12 UTC 2013 - coolo@suse.com
- switch to ruby 2.0 default
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 21 15:42:54 UTC 2013 - adrian@suse.de Mon Jan 21 15:42:54 UTC 2013 - adrian@suse.de

34
ruby.macros
View File

@ -21,28 +21,28 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# #
%rb_binary %{rb19_binary} %rb_binary %{rb20_binary}
%gem_binary /usr/bin/gem1.9 %gem_binary /usr/bin/gem2.0
%rb_arch %{rb19_arch} %rb_arch %{rb20_arch}
%rb_ver %{rb19_ver} %rb_ver %{rb20_ver}
%rb_dir %{rb19_dir} %rb_dir %{rb20_dir}
%rb_libdir %{rb19_libdir} %rb_libdir %{rb20_libdir}
%rb_archdir %{rb19_archdir} %rb_archdir %{rb20_archdir}
%rb_sitedir %rb19_sitedir %rb_sitedir %rb20_sitedir
%rb_sitelibdir %rb19_sitelibdir %rb_sitelibdir %rb20_sitelibdir
%rb_sitearchdir %rb19_sitearchdir %rb_sitearchdir %rb20_sitearchdir
%rb_vendordir %rb19_vendordir %rb_vendordir %rb20_vendordir
%rb_vendorlibdir %rb19_vendorlibdir %rb_vendorlibdir %rb20_vendorlibdir
%rb_vendorarchdir %rb19_vendorarchdir %rb_vendorarchdir %rb20_vendorarchdir
# old names # old names
%rb_sitelib %rb19_sitelibdir %rb_sitelib %rb20_sitelibdir
%rb_sitearch %rb19_sitearchdir %rb_sitearch %rb20_sitearchdir
# #
%rb_vendorlib %rb19_vendorlibdir %rb_vendorlib %rb20_vendorlibdir
%rb_vendorarch %rb19_vendorarchdir %rb_vendorarch %rb20_vendorarchdir

18
ruby.spec
View File

@ -17,7 +17,7 @@
Name: ruby Name: ruby
Version: 1.9.3 Version: 2.0
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: ruby.macros Source0: ruby.macros
@ -28,16 +28,16 @@ Summary: An Interpreted Object-Oriented Scripting Language
License: MIT License: MIT
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
BuildRequires: ruby-common BuildRequires: ruby-common
BuildRequires: ruby19-devel BuildRequires: ruby20-devel
BuildRequires: update-alternatives BuildRequires: update-alternatives
#!BuildIgnore: ruby ruby-devel #!BuildIgnore: ruby ruby-devel
#!BuildIgnore: rubygems #!BuildIgnore: rubygems
%requires_eq ruby19 %requires_eq ruby20
Provides: rubygems = 1.8.15 Provides: rubygems = 1.8.15
Obsoletes: rubygems < 1.8.15 Obsoletes: rubygems < 1.8.15
Requires: update-alternatives Requires: update-alternatives
%{expand:%(rpm -ql ruby19 | fgrep .gemspec | /usr/bin/ruby1.9 /usr/lib/rpm/rubygemsdeps.rb --provides | sed -e 's,^,Provides:,')} %{expand:%(rpm -ql ruby20 | fgrep .gemspec | /usr/bin/ruby2.0 /usr/lib/rpm/rubygemsdeps.rb --provides | sed -e 's,^,Provides:,')}
%description %description
Ruby is an interpreted scripting language for quick and easy Ruby is an interpreted scripting language for quick and easy
@ -72,7 +72,7 @@ BeOS, and more)
Summary: Development files to link against Ruby Summary: Development files to link against Ruby
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Requires: %{name} Requires: %{name}
Requires: ruby19-devel Requires: ruby20-devel
Provides: rubygems_with_buildroot_patch Provides: rubygems_with_buildroot_patch
%description devel %description devel
@ -85,23 +85,23 @@ Development files to link against Ruby.
%install %install
mkdir -p $RPM_BUILD_ROOT%_bindir mkdir -p $RPM_BUILD_ROOT%_bindir
for bin in erb gem irb rake rdoc ri ruby testrb; do for bin in erb gem irb rake rdoc ri ruby testrb; do
ln -s %_bindir/"$bin"1.9 $RPM_BUILD_ROOT%_bindir/$bin ln -s %_bindir/"$bin"2.0 $RPM_BUILD_ROOT%_bindir/$bin
done done
mkdir -p $RPM_BUILD_ROOT%_libdir mkdir -p $RPM_BUILD_ROOT%_libdir
ln -s %_libdir/libruby1.9.so $RPM_BUILD_ROOT%_libdir/libruby.so ln -s %_libdir/libruby2.0.so $RPM_BUILD_ROOT%_libdir/libruby.so
install -D -m 0644 %{S:0} $RPM_BUILD_ROOT/etc/rpm/macros.ruby install -D -m 0644 %{S:0} $RPM_BUILD_ROOT/etc/rpm/macros.ruby
install -D -m 0644 %{S:2} $RPM_BUILD_ROOT/etc/gemrc install -D -m 0644 %{S:2} $RPM_BUILD_ROOT/etc/gemrc
%post %post
for bin in erb gem irb rake rdoc ri ruby testrb; do for bin in erb gem irb rake rdoc ri ruby testrb; do
/usr/sbin/update-alternatives --install \ /usr/sbin/update-alternatives --install \
%{_bindir}/$bin $bin %{_bindir}/$bin"1.9" 19 %{_bindir}/$bin $bin %{_bindir}/$bin"2.0" 20
done done
%preun %preun
if [ "$1" = 0 ] ; then if [ "$1" = 0 ] ; then
for bin in erb gem irb rake rdoc ri ruby testrb; do for bin in erb gem irb rake rdoc ri ruby testrb; do
/usr/sbin/update-alternatives --remove $bin %{_bindir}/$bin"1.9" /usr/sbin/update-alternatives --remove $bin %{_bindir}/$bin"2.0"
done done
fi fi