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

Move the definition of %license macro into %files section.

Browse Source 
The definition on the top of the file does not work on RHEL6 for some
reasons :/ But it works if defined in the first %file section :)
This commit is contained in:
Vít Ondruch 2017-01-09 12:15:30 +01:00
parent 88cbe3e329
commit 66d12e4545
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruby.spec
View File

@ -24,7 +24,7 @@
%endif
%global release 72
%global release 73
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
# The RubyGems library has to stay out of Ruby directory three, since the
@ -69,10 +69,6 @@
%global with_checksec 1
%endif
# There is no %%license macro on RHEL6.
# https://bugzilla.redhat.com/show_bug.cgi?id=1386246
%{!?_licensedir:%global license %%doc}
Summary: An interpreter of object-oriented scripting language
Name: %{?scl_prefix}ruby
Version: %{ruby_version}
@ -746,6 +742,10 @@ make check TESTS="-v $DISABLE_TESTS"
%postun libs -p /sbin/ldconfig
%files
# There is no %%license macro on RHEL6.
# https://bugzilla.redhat.com/show_bug.cgi?id=1386246
%{!?_licensedir:%global license %%doc}
%license BSDL
%license COPYING
%lang(ja) %license COPYING.ja
@ -1042,7 +1042,7 @@ make check TESTS="-v $DISABLE_TESTS"
%{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
%changelog
* Mon Jan 09 2017 Vít Ondruch <vondruch@redhat.com> - 2.4.0-72
* Mon Jan 09 2017 Vít Ondruch <vondruch@redhat.com> - 2.4.0-73
- Reshuffle the %%license macro to avoid %%postun scriptlet issues.
Resolves: rhbz#1411233