From f692e998f201f3051dda3e90638f2fd3397b9758 Mon Sep 17 00:00:00 2001
From: Vít Ondruch <vondruch@redhat.com>
Date: Jul 24 2018 11:47:25 +0000
Subject: Don't enforce modulefile ownership.


Enforcing existence and ownership of the modulefile unnecessarily
breaks compatibility with SCL 1.x.

This reverts 7794daf12911054aae01988f6e42c868eead788f

---

diff --git a/macros.scl-filesystem b/macros.scl-filesystem
index a64effa..4a5178b 100644
--- a/macros.scl-filesystem
+++ b/macros.scl-filesystem
@@ -4,8 +4,6 @@
 %dir %attr(555,root,root) %{_scl_root}
 %dir %attr(555,root,root) %{_scl_scripts}
 %{_scl_scripts}/enable
-%{_scl_scripts}/%{scl}
-%{_root_sysconfdir}/scl/modulefiles/%{scl}
 %{_root_sysconfdir}/scl/prefixes/%scl
 %{_scl_root}/bin
 %attr(555,root,root) %{_scl_root}/boot
@@ -111,7 +109,7 @@ EOF
 cat >> %{buildroot}%{_root_sysconfdir}/scl/prefixes/%{scl} << EOF
 %_scl_prefix
 EOF
-ln -s %{_scl_scripts}/%{scl} %{buildroot}%{_root_sysconfdir}/scl/modulefiles/%{scl}
+test -e %{buildroot}%{_scl_scripts}/%{scl} && ln -s %{_scl_scripts}/%{scl} %{buildroot}%{_root_sysconfdir}/scl/modulefiles/%{scl}
 # filelist
 set +x
 cat >> %{buildroot}/lang-exceptions << EOF
diff --git a/scl-utils.spec b/scl-utils.spec
index 91d5b18..4abd696 100644
--- a/scl-utils.spec
+++ b/scl-utils.spec
@@ -3,7 +3,7 @@
 Name:       scl-utils
 Epoch:      1
 Version:    2.0.2
-Release:    6%{dist}
+Release:    7%{dist}
 Summary:    Utilities for alternative packaging
 
 License:    GPLv2+
@@ -76,6 +76,9 @@ ln -s prefixes conf
 %{_rpmconfigdir}/brp-scl-python-bytecompile
 
 %changelog
+* Tue Jul 24 2018 Vít Ondruch <vondruch@redhat.com> - 1:2.0.2-7
+- Don't enforce modulefile ownership.
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild