diff --git a/ruby.changes b/ruby.changes index b817120..96d874c 100644 --- a/ruby.changes +++ b/ruby.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 2 09:07:57 UTC 2014 - kkaempf@suse.com + +- make api_version explicit in spec +- adapt versions of embedded gems + ------------------------------------------------------------------- Fri Feb 28 14:14:00 UTC 2014 - adrian@suse.de diff --git a/ruby.spec b/ruby.spec index 4ab2f98..e284cef 100644 --- a/ruby.spec +++ b/ruby.spec @@ -27,6 +27,8 @@ Name: ruby %define patch_level p0 Version: 2.1.1 Release: 0 +# make the exported API version explicit +%define api_version 2.1.0 # ruby-macros and ruby-common version %define rpm_macros_version 3 @@ -35,7 +37,7 @@ Release: 0 %define pkg_version %{version} %define libname lib%{name}2_1 # keep in sync with macro file! -%define rb_ver 2.1.0 +%define rb_ver %{api_version} %define rb_arch %(echo %{_target_cpu}-linux-gnu | sed -e "s/ppc/powerpc/") %define rb_libdir %{_libdir}/ruby/%{rb_ver}/ %define rb_archdir %{_libdir}/ruby/%{rb_ver}/%{rb_arch} @@ -168,15 +170,15 @@ Group: Development/Languages/Ruby # - the usual means to generate provides for rubygems is using ruby # and ruby is not available while building ruby :-/ -%define gen_embedded_provides4() %(awk -f %{S:8} -- 2.1.0 %arch %1 %2 %3 %4) -%define gen_embedded_provides5() %(awk -f %{S:8} -- 2.1.0 %arch %1 %2 %3 %4 %5) +%define gen_embedded_provides4() %(awk -f %{S:8} -- %api_version %arch %1 %2 %3 %4) +%define gen_embedded_provides5() %(awk -f %{S:8} -- %api_version %arch %1 %2 %3 %4 %5) %gen_embedded_provides4 io-console 0 4 2 %gen_embedded_provides4 json 1 8 1 %gen_embedded_provides4 minitest 4 7 5 -%gen_embedded_provides4 psych 2 0 2 +%gen_embedded_provides4 psych 2 0 3 %gen_embedded_provides4 rake 10 1 0 %gen_embedded_provides4 rdoc 4 1 0 -%gen_embedded_provides5 test-unit 2 1 0 0 +%gen_embedded_provides5 test-unit 2 1 1 0 ################################