diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index 679c0d3..0f78862 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,6 +1,6 @@ Name: epel-rpm-macros Version: 6 -Release: 3 +Release: 4 Summary: Extra Packages for Enterprise Linux RPM macros Group: System Environment/Base @@ -37,6 +37,9 @@ install -Dpm 644 %{SOURCE0} \ /etc/rpm/macros.zzz-epel %changelog +* Tue Feb 09 2016 Jason L Tibbitts III - 6-4 +- Guard against issues with the %%scl_debug macro. + * Mon Jan 25 2016 Jason L Tibbitts III - 6-3 - Try defining %%license a different (and much simpler) way. diff --git a/macros.zzz-epel b/macros.zzz-epel index ee25c07..4a7c168 100644 --- a/macros.zzz-epel +++ b/macros.zzz-epel @@ -3,16 +3,21 @@ # This file is named such that it appears alphabetically after other macro # files in /etc/rpm. -# This macro defines %license to work like %doc. It hangs off of a -# redefinition of %description. It's not possible to have a simple definition +# This macro defines %%license to work like %%doc. It hangs off of a +# redefinition of %%description. It's not possible to have a simple definition # because RPM will overwrite %license as soon as it parses a License: tag. - -# Ideally this should happen as late as possible, but it seems there are troubles -# with some other sets of macros if we use %files, so try doing it earlier. -%description %{lua: +# +# There are bugs in the SCL macros which cause them to interact poorly with +# previous attempts at this macro. The current implementation is guarded so as +# to not call into lua (and not do the %%license magic) if the %%scl_debug macro +# is present. +# +# Note that this is ugly because we have to be very careful of whitespace +# outside of lua. +%description %{?scl_debug:%%description}%{!?scl_debug:%{lua: rpm.define("license %doc") print("%description") -} +}} # Add nodejs_arches - in redhat-rpm-config in EL7 %nodejs_arches %{ix86} x86_64 %{arm}