[ruby/ruby-2.0] Let Sed escape in original file.

Vít Ondruch vondruch at fedoraproject.org
Tue Jan 22 16:06:52 UTC 2013


commit badae78597409c822c63c41ef8784d70faf372c8
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Jan 22 17:06:43 2013 +0100

    Let Sed escape in original file.

 ruby.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 6d5b5bc..8bbf490 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -69,7 +69,7 @@
 # Might not be needed in the future, if we are lucky enough.
 # https://bugzilla.redhat.com/show_bug.cgi?id=888262
 %global tapset_root %{_datadir}/systemtap
-%global tapset_dir %{tapset_root}/tapset/
+%global tapset_dir %{tapset_root}/tapset
 %global tapset_libdir %(echo %{_libdir} | sed 's/64//')*
 
 %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/')
@@ -507,7 +507,7 @@ 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
 # Escape '*/' in comment.
-sed -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{ruby_version}.stp
+sed -i -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{ruby_version}.stp
 
 %check
 DISABLE_TESTS=""


More information about the scm-commits mailing list