From 9725cbddb9b2b6b2ba4ec01bbda9f3a536a83f0783c499bd0550d3f035b96aca Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Mon, 29 Mar 2021 12:02:18 +0000
Subject: [PATCH] Accepting request 880611 from
 home:phiwag:branches:systemsmanagement

- Mark the download service as disabled to meet factory submission
  guidelines.
- Add a runtime dependency on Python for createmodule.py script.
- Set /usr/bin/python3 as interpreter for all Python scripts (instead
  of relying on /usr/bin/env, which is used by default).
- Add fdupes back to solve rpmlint warning.

OBS-URL: https://build.opensuse.org/request/show/880611
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/Modules?expand=0&rev=30
---
 Modules.changes                                        | 10 ++++++++++
 Modules.spec                                           |  7 +++++--
 _service                                               |  2 +-
 ..._files:modules-4.7.0.tar.gz => modules-4.7.0.tar.gz |  0
 4 files changed, 16 insertions(+), 3 deletions(-)
 rename _service:download_files:modules-4.7.0.tar.gz => modules-4.7.0.tar.gz (100%)

diff --git a/Modules.changes b/Modules.changes
index a0524ab..4c5d4bc 100644
--- a/Modules.changes
+++ b/Modules.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Mar 22 18:48:48 UTC 2021 - Philipp Wagner <mail@philipp-wagner.com>
+
+- Mark the download service as disabled to meet factory submission
+  guidelines.
+- Add a runtime dependency on Python for createmodule.py script.
+- Set /usr/bin/python3 as interpreter for all Python scripts (instead
+  of relying on /usr/bin/env, which is used by default).
+- Add fdupes back to solve rpmlint warning.
+
 -------------------------------------------------------------------
 Sat Feb 20 23:27:43 UTC 2021 - Philipp Wagner <mail@philipp-wagner.com>
 
diff --git a/Modules.spec b/Modules.spec
index d25d6af..cca0b94 100644
--- a/Modules.spec
+++ b/Modules.spec
@@ -18,6 +18,7 @@
 
 Name:           Modules
 BuildRequires:  automake
+BuildRequires:  fdupes
 BuildRequires:  less
 BuildRequires:  procps
 BuildRequires:  tcl-devel
@@ -27,6 +28,7 @@ Release:        0
 Summary:        Change environment at runtime
 License:        BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          System/Management
+Requires:       python3
 Requires:       tcl
 Source:         https://download.sourceforge.net/project/modules/Modules/modules-%{version}/modules-%{version}.tar.gz
 Patch1:         Remove-empty-unused-static-function.patch
@@ -62,7 +64,6 @@ Modules are useful in managing different versions of applications. Modules can
 also be bundled into metamodules that will load an entire suite of different
 applications.
 
-
 %package doc
 Summary:        Documentation for Environment Modules
 Group:          Documentation/Other
@@ -114,7 +115,8 @@ sed -i 's@/usr/bin/env bash@/bin/bash@' script/envml
     %{?vimdatadir: --vimdatadir=%{vimdatadir}} \
     --etcdir=%{_sysconfdir}/%{name} \
     --libdir=%{_libdir}/%{name} \
-    --enable-compat-version
+    --enable-compat-version \
+    --with-python=/usr/bin/python3
 make %{?_smp_mflags}
 
 %install
@@ -123,6 +125,7 @@ install -d %{buildroot}/etc/profile.d
 make DESTDIR=%{buildroot} install
 install -d %{buildroot}/usr/bin
 mv %{buildroot}/usr/share/doc doc_dir
+%fdupes -s %{buildroot}%{_datadir}
 
 ln -sf %{_datadir}/Modules/init/profile.sh %{buildroot}%{_sysconfdir}/profile.d/modules.sh
 ln -sf %{_datadir}/Modules/init/profile.csh %{buildroot}%{_sysconfdir}/profile.d/modules.csh
diff --git a/_service b/_service
index e1612ad..595d83c 100644
--- a/_service
+++ b/_service
@@ -1,4 +1,4 @@
 <services>
- <service name="download_files"/>
+ <service name="download_files" mode="disabled"/>
 </services>
 
diff --git a/_service:download_files:modules-4.7.0.tar.gz b/modules-4.7.0.tar.gz
similarity index 100%
rename from _service:download_files:modules-4.7.0.tar.gz
rename to modules-4.7.0.tar.gz