From 42aef7d5d237d0801deb05ccd2d475815e2b7ff8 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 22 Sep 2017 16:57:54 -0400 Subject: [PATCH] Try to ensure that our macros are sourced last. ... because we think last-sourced wins and the competition is stiff. --- module_build_service/builder/KojiModuleBuilder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py index bdc2a725..193cd9e3 100644 --- a/module_build_service/builder/KojiModuleBuilder.py +++ b/module_build_service/builder/KojiModuleBuilder.py @@ -186,13 +186,13 @@ It should NEVER be installed on any system as it will really mess up %build %install -mkdir -p %buildroot/%_rpmconfigdir/macros.d 2>/dev/null |: -cp %SOURCE1 %buildroot/%_rpmconfigdir/macros.d/macros.modules -chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules +mkdir -p %buildroot/%_sysconfdir/rpm 2>/dev/null |: +cp %SOURCE1 %buildroot/%_sysconfdir/rpm/macros.zz-modules +chmod 644 %buildroot/%_sysconfdir/rpm/macros.zz-modules %files -%_rpmconfigdir/macros.d/macros.modules +%_sysconfdir/rpm/macros.zz-modules