From 66d12e4545f5b74521441f3e52da87d4897c6f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 9 Jan 2017 12:15:30 +0100 Subject: [PATCH] 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 :) --- ruby.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ruby.spec b/ruby.spec index d3b6b6a..53b3b80 100644 --- a/ruby.spec +++ b/ruby.spec @@ -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 - 2.4.0-72 +* Mon Jan 09 2017 Vít Ondruch - 2.4.0-73 - Reshuffle the %%license macro to avoid %%postun scriptlet issues. Resolves: rhbz#1411233