vondruch pushed to ruby (f21). "Fix libruby.so versions in SystemTap scripts (rhbz#1218274)."

notifications at fedoraproject.org notifications at fedoraproject.org
Mon May 4 13:54:00 UTC 2015


>From a97ee0bcd3e116a2f086257cdf9fb18f1c09f6dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Mon, 23 Mar 2015 11:01:10 +0100
Subject: Fix libruby.so versions in SystemTap scripts (rhbz#1218274).


diff --git a/ruby.spec b/ruby.spec
index 53b129c..bdffe4b 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -21,7 +21,7 @@
 %endif
 
 
-%global release 27
+%global release 28
 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
 %global rubygems_version 2.2.2
@@ -533,10 +533,10 @@ sed -i '/^end$/ i\
 
 # Install a tapset and fix up the path to the library.
 mkdir -p %{buildroot}%{tapset_dir}
-sed -e "s|@LIBRARY_PATH@|%{tapset_libdir}/libruby.so.%{ruby_version}|" \
-  %{SOURCE2} > %{buildroot}%{tapset_dir}/libruby.so.%{ruby_version}.stp
+sed -e "s|@LIBRARY_PATH@|%{tapset_libdir}/libruby.so.%{major_minor_version}|" \
+  %{SOURCE2} > %{buildroot}%{tapset_dir}/libruby.so.%{major_minor_version}.stp
 # Escape '*/' in comment.
-sed -i -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{ruby_version}.stp
+sed -i -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{major_minor_version}.stp
 
 %check
 DISABLE_TESTS=""
@@ -870,6 +870,9 @@ make check TESTS="-v $DISABLE_TESTS"
 %{ruby_libdir}/tkextlib
 
 %changelog
+* Mon May 04 2015 Vít Ondruch <vondruch at redhat.com> - 2.1.6-28
+- Fix libruby.so versions in SystemTap scripts (rhbz#1218274).
+
 * Tue Apr 14 2015 Josef Stribny <jstribny at redhat.com> - 2.1.6-27
 - Update to 2.1.6
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ruby.git/commit/?h=f21&id=a97ee0bcd3e116a2f086257cdf9fb18f1c09f6dc


More information about the scm-commits mailing list