rpms
/
ruby
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't ship .stp files when SystemTap support is disabled. 

Related: rhbz#1657915
This commit is contained in:
Vít Ondruch 2019-02-07 15:16:51 +01:00
parent 2cf4920fa3
commit 214a591366
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruby.spec
View File

@ -701,12 +701,14 @@ sed -i '/^end$/ i\
# Move man pages into proper location # Move man pages into proper location
mv %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/doc/rake.1 %{buildroot}%{_mandir}/man1 mv %{buildroot}%{gem_dir}/gems/rake-%{rake_version}/doc/rake.1 %{buildroot}%{_mandir}/man1
%if %{with systemtap}
# Install a tapset and fix up the path to the library. # Install a tapset and fix up the path to the library.
mkdir -p %{buildroot}%{tapset_dir} mkdir -p %{buildroot}%{tapset_dir}
sed -e "s|@LIBRARY_PATH@|%{tapset_libdir}/libruby.so.%{major_minor_version}|" \ sed -e "s|@LIBRARY_PATH@|%{tapset_libdir}/libruby.so.%{major_minor_version}|" \
%{SOURCE2} > %{buildroot}%{tapset_dir}/libruby.so.%{major_minor_version}.stp %{SOURCE2} > %{buildroot}%{tapset_dir}/libruby.so.%{major_minor_version}.stp
# Escape '*/' in comment. # Escape '*/' in comment.
sed -i -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{major_minor_version}.stp sed -i -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{major_minor_version}.stp
%endif
# Prepare -doc subpackage file lists. # Prepare -doc subpackage file lists.
find doc -maxdepth 1 -type f ! -name '.*' ! -name '*.ja*' > .ruby-doc.en find doc -maxdepth 1 -type f ! -name '.*' ! -name '*.ja*' > .ruby-doc.en
@ -945,7 +947,7 @@ OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file OPENSSL_CONF='' \
%{ruby_libarchdir}/syslog.so %{ruby_libarchdir}/syslog.so
%{ruby_libarchdir}/zlib.so %{ruby_libarchdir}/zlib.so
%{tapset_root} %{?with_systemtap:%{tapset_root}}
%files -n rubygems %files -n rubygems
%{_bindir}/gem %{_bindir}/gem
@ -1015,7 +1017,7 @@ OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file OPENSSL_CONF='' \
%files doc -f .ruby-doc.en -f .ruby-doc.ja %files doc -f .ruby-doc.en -f .ruby-doc.ja
%doc README.md %doc README.md
%doc ChangeLog %doc ChangeLog
%doc ruby-exercise.stp %{?with_systemtap:%doc ruby-exercise.stp}
%{_datadir}/ri %{_datadir}/ri
%files -n rubygem-bigdecimal %files -n rubygem-bigdecimal
@ -1099,6 +1101,8 @@ OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file OPENSSL_CONF='' \
* Remove Patch19: ruby-2.6.0-net-http-net-ftp-fix-session-resumption-with * Remove Patch19: ruby-2.6.0-net-http-net-ftp-fix-session-resumption-with
-TLS-1.3.patch; subsumed -TLS-1.3.patch; subsumed
Resolves: rhbz#1688758 Resolves: rhbz#1688758
- Don't ship .stp files when SystemTap support is disabled.
Related: rhbz#1657915
* Fri Jan 11 2019 Jun Aruga <jaruga@redhat.com> - 2.5.3-103 * Fri Jan 11 2019 Jun Aruga <jaruga@redhat.com> - 2.5.3-103
- Refresh expired certificates to fix FTBFS. - Refresh expired certificates to fix FTBFS.