Move the definition of %license macro into %files section.
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:
parent
88cbe3e329
commit
66d12e4545
12
ruby.spec
12
ruby.spec
|
@ -24,7 +24,7 @@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%global release 72
|
%global release 73
|
||||||
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
|
%{!?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
|
# The RubyGems library has to stay out of Ruby directory three, since the
|
||||||
|
@ -69,10 +69,6 @@
|
||||||
%global with_checksec 1
|
%global with_checksec 1
|
||||||
%endif
|
%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
|
Summary: An interpreter of object-oriented scripting language
|
||||||
Name: %{?scl_prefix}ruby
|
Name: %{?scl_prefix}ruby
|
||||||
Version: %{ruby_version}
|
Version: %{ruby_version}
|
||||||
|
@ -746,6 +742,10 @@ make check TESTS="-v $DISABLE_TESTS"
|
||||||
%postun libs -p /sbin/ldconfig
|
%postun libs -p /sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
# There is no %%license macro on RHEL6.
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1386246
|
||||||
|
%{!?_licensedir:%global license %%doc}
|
||||||
|
|
||||||
%license BSDL
|
%license BSDL
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%lang(ja) %license COPYING.ja
|
%lang(ja) %license COPYING.ja
|
||||||
|
@ -1042,7 +1042,7 @@ make check TESTS="-v $DISABLE_TESTS"
|
||||||
%{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
|
%{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
|
||||||
|
|
||||||
%changelog
|
%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.
|
- Reshuffle the %%license macro to avoid %%postun scriptlet issues.
|
||||||
Resolves: rhbz#1411233
|
Resolves: rhbz#1411233
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue