From 544a1f6e609f552a8a6746471c80f7202761e801 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 22 Aug 2019 15:35:58 +0200
Subject: [PATCH] Fix error: macro %undefine is a built-in #1744583

---
 macros.scl-filesystem | 2 --
 scl-utils.spec        | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/macros.scl-filesystem b/macros.scl-filesystem
index 4a5178b..b64cba6 100644
--- a/macros.scl-filesystem
+++ b/macros.scl-filesystem
@@ -102,9 +102,7 @@ mkdir -p %{buildroot}%{_root_sysconfdir}/{rpm,scl/{prefixes,modulefiles}}
 cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF
 %%%%scl %scl
 %{?nfsmountable:%%%%nfsmountable %{nfsmountable}}
-%{!?nfsmountable:%%%%undefine nfsmountable}
 %{?rh_layout:%%%%rh_layout %{rh_layout}}
-%{!?rh_layout:%%%%undefine rh_layout}
 EOF
 cat >> %{buildroot}%{_root_sysconfdir}/scl/prefixes/%{scl} << EOF
 %_scl_prefix
diff --git a/scl-utils.spec b/scl-utils.spec
index b9bb85b..7fddaee 100644
--- a/scl-utils.spec
+++ b/scl-utils.spec
@@ -3,7 +3,7 @@
 Name:       scl-utils
 Epoch:      1
 Version:    2.0.2
-Release:    11%{dist}
+Release:    12%{dist}
 Summary:    Utilities for alternative packaging
 
 License:    GPLv2+
@@ -74,6 +74,9 @@ ln -s prefixes conf
 %{_rpmconfigdir}/brp-scl-python-bytecompile
 
 %changelog
+* Thu Aug 22 2019 Remi Collet <remi@remirepo.net> - 1:2.0.2-12
+- Fix error: macro %%undefine is a built-in #1744583
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild