Accepting request 874078 from home:phiwag:branches:systemsmanagement

Update to 4.7.0, add fish support, and clean up spec file

OBS-URL: https://build.opensuse.org/request/show/874078
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/Modules?expand=0&rev=29

Modules.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sat Feb 20 23:27:43 UTC 2021 - Philipp Wagner <mail@philipp-wagner.com>
+
+- Update to version 4.7.0
+  Check https://github.com/cea-hpc/modules/releases/tag/v4.7.0
+  for details.
+- Mark sh and csh module initialization scripts installed into
+  /etc/profile.d as managed by this package by moving the symlinking
+  to the %install section.
+- Support fish (shell completion and functionality).
+- Use a source service instead of manually adding the source tarball.
+- Clean up spec file to remove unused code (e.g. CFLAGS which aren't
+  used in the source code any more, since it's all TCL now).
+- Update description to match the current description on the homepage.
+
 -------------------------------------------------------------------
 Fri May 15 05:39:32 UTC 2020 - Egbert Eich <eich@suse.com>
 
@@ -14,9 +29,9 @@ Fri May 15 05:39:32 UTC 2020 - Egbert Eich <eich@suse.com>
 -------------------------------------------------------------------
 Tue Apr 17 11:13:53 UTC 2018 - boris@steki.net
 
-- rolled back change from /usr/share/Modules (package name) to old 
+- rolled back change from /usr/share/Modules (package name) to old
   expected behavior /usr/share/modules
-- fixed redhat/fedora builds 
+- fixed redhat/fedora builds
 
 -------------------------------------------------------------------
 Mon Apr 16 19:24:51 UTC 2018 - boris@steki.net
@@ -87,7 +102,7 @@ Mon Sep 10 08:30:51 UTC 2012 - kkaempf@suse.com
 -------------------------------------------------------------------
 Wed Aug 29 20:11:14 UTC 2012 - alinm.elena@gmail.com
 
-- update to 3.2.9c 
+- update to 3.2.9c
   * Fix the coexistence of load/remove flags (Martin Siegert)
   * Fixed an overlapping string copy (Wilson Snyder & Orion Poplawski)
   * Isolated calls to the new interpreter and get & set env.vars.
@@ -96,7 +111,7 @@ Wed Aug 29 20:11:14 UTC 2012 - alinm.elena@gmail.com
   * Fixed the "module purge" memory corruption (Poor Yorick)
   * Added support for Ruby (Tammo Tjarks)
 - replace defaut in the profile files with the proper version
-- make module files from /etc %config 
+- make module files from /etc %config
 
 -------------------------------------------------------------------
 Thu Dec  1 11:19:55 UTC 2011 - coolo@suse.com
@@ -182,4 +197,3 @@ Wed Jun  6 19:07:27 CEST 2001 - nashif@suse.de
 Mon Feb 19 07:25:27 MET 2001 - nashif@suse.de
 
 - Initial Release (Version 3.1.1)
-

Modules.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package Modules
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,11 @@
 
 Name:           Modules
 BuildRequires:  automake
-BuildRequires:  fdupes
 BuildRequires:  less
 BuildRequires:  procps
 BuildRequires:  tcl-devel
-# xorg-x11-devel
 URL:            http://modules.sourceforge.net/
-Version:        4.5.0
+Version:        4.7.0
 Release:        0
 Summary:        Change environment at runtime
 License:        BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -44,33 +42,52 @@ BuildRequires:  perl(Exporter)
 %endif
 
 %description
-The Modules package provides for dynamic modification of a user's
+The Modules package is a tool that simplify shell initialization and lets
-environment with module files.	Each module file contains the
+users easily modify their environment during the session with modulefiles.
-information needed to configure the shell for an application. Once the
+
-package is initialized, the environment can be modified dynamically on
+Each modulefile contains the information needed to configure the shell for an
-a per-module basis using the module command that interprets module
+application. Once the Modules package is initialized, the environment can be
-files. Typically, module files instruct the module command to alter or
+modified on a per-module basis using the module command which interprets
-set shell environment variables, such as PATH or MANPATH. Module files
+modulefiles. Typically modulefiles instruct the module command to alter or set
-may be shared by many users on a system and users may have their own
+shell environment variables such as PATH, MANPATH, etc. modulefiles may be
-collection to supplement or replace the shared module files.  The
+shared by many users on a system and users may have their own collection to
-modules environment is common on SGI/Crays and many workstation farms.
+supplement or replace the shared modulefiles.
+
+Modules can be loaded and unloaded dynamically and atomically, in an clean
+fashion. All popular shells are supported, including bash, ksh, zsh, sh, csh,
+tcsh, fish, as well as some scripting languages such as tcl, perl, python,
+ruby, cmake and r.
+
+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 Change environment at runtime
+Summary:        Documentation for Environment Modules
 Group:          Documentation/Other
 BuildArch:      noarch
 
 %description doc
-The Modules package provides for dynamic modification of a user's
+The Modules package is a tool that simplify shell initialization and lets
-environment with module files.	Each module file contains the
+users easily modify their environment during the session with modulefiles.
-information needed to configure the shell for an application. Once the
+
-package is initialized, the environment can be modified dynamically on
+Each modulefile contains the information needed to configure the shell for an
-a per-module basis using the module command that interprets module
+application. Once the Modules package is initialized, the environment can be
-files. Typically, module files instruct the module command to alter or
+modified on a per-module basis using the module command which interprets
-set shell environment variables, such as PATH or MANPATH. Module files
+modulefiles. Typically modulefiles instruct the module command to alter or set
-may be shared by many users on a system and users may have their own
+shell environment variables such as PATH, MANPATH, etc. modulefiles may be
-collection to supplement or replace the shared module files.  The
+shared by many users on a system and users may have their own collection to
-modules environment is common on SGI/Crays and many workstation farms.
+supplement or replace the shared modulefiles.
+
+Modules can be loaded and unloaded dynamically and atomically, in an clean
+fashion. All popular shells are supported, including bash, ksh, zsh, sh, csh,
+tcsh, fish, as well as some scripting languages such as tcl, perl, python,
+ruby, cmake and r.
+
+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.
 
 %define vimdatadir %{_datadir}/vim/site
 
@@ -83,22 +100,21 @@ modules environment is common on SGI/Crays and many workstation farms.
 sed -i 's@/usr/bin/env bash@/bin/bash@' script/envml
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE" \
 ./configure \
-                --initdir="%{_datadir}/%name/init" \
+    --initdir="%{_datadir}/%name/init" \
-                --libexecdir="%{_prefix}/%_lib/%{name}/" \
+    --libexecdir="%{_prefix}/%_lib/%{name}/" \
-                --prefix="%_prefix" \
+    --prefix="%_prefix" \
-                --with-version-path="%_datadir/%{name}" \
+    --with-version-path="%_datadir/%{name}" \
-                --modulefilesdir="%{_datadir}/modules" \
+    --modulefilesdir="%{_datadir}/modules" \
-		--mandir=%{_mandir} \
+    --mandir=%{_mandir} \
-                --with-etc-path="%_sysconfdir" \
+    --with-etc-path="%_sysconfdir" \
-                --with-skel-path="%_sysconfdir/skel" \
+    --with-skel-path="%_sysconfdir/skel" \
-		--with-tcl=%{_libdir} \
+    --with-tcl=%{_libdir} \
-		--without-x \
+    %{?!vimdatadir: --disable-vim-addons} \
-		%{?!vimdatadir: --disable-vim-addons} \
+    %{?vimdatadir: --vimdatadir=%{vimdatadir}} \
-		%{?vimdatadir: --vimdatadir=%{vimdatadir}} \
+    --etcdir=%{_sysconfdir}/%{name} \
-                --etcdir=%{_sysconfdir}/%{name} \
+    --libdir=%{_libdir}/%{name} \
-                --libdir=%{_libdir}/%{name}
+    --enable-compat-version
 make %{?_smp_mflags}
 
 %install
@@ -107,19 +123,13 @@ 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}
 
-%post
+ln -sf %{_datadir}/Modules/init/profile.sh %{buildroot}%{_sysconfdir}/profile.d/modules.sh
-[ -e %{_sysconfdir}/profiles.d/modules.sh ] || \
+ln -sf %{_datadir}/Modules/init/profile.csh %{buildroot}%{_sysconfdir}/profile.d/modules.csh
-    ln -sf %{_datadir}/Modules/init/profile.sh %{_sysconfdir}/profile.d/modules.sh
-[ -e %{_sysconfdir}/profiles.d/modules.sh ] || \
-    ln -sf %{_datadir}/Modules/init/profile.csh %{_sysconfdir}/profile.d/modules.csh 
 
-%postun
+mkdir -p %{buildroot}%{_datadir}/fish/{vendor_completions.d,vendor_functions.d}
-[ -e %{_sysconfdir}/profiles.d/modules.sh ] || \
+ln -sf %{_datadir}/Modules/init/fish_completion %{buildroot}%{_datadir}/fish/vendor_completions.d/module.fish
-      rm -f %{_sysconfdir}/profile.d/modules.sh
+ln -sf %{_datadir}/Modules/init/fish %{buildroot}%{_datadir}/fish/vendor_functions.d/module.fish
-[ -e %{_sysconfdir}/profiles.d/modules.csh ] || \
-      rm -f %{_sysconfdir}/profile.d/modules.csh
 
 %files
 %defattr(-,root,root)
@@ -145,6 +155,13 @@ mv %{buildroot}/usr/share/doc doc_dir
 %{_mandir}/man1/module.1*
 %{_mandir}/man4/modulefile-compat.4*
 %{_mandir}/man4/modulefile.4*
+%{_sysconfdir}/profile.d/modules.sh
+%{_sysconfdir}/profile.d/modules.csh
+%dir %{_datadir}/fish/
+%dir %{_datadir}/fish/vendor_completions.d/
+%{_datadir}/fish/vendor_completions.d/module.fish
+%dir %{_datadir}/fish/vendor_functions.d/
+%{_datadir}/fish/vendor_functions.d/module.fish
 
 %files doc
 %defattr(-,root,root)

_service

@@ -0,0 +1,4 @@
+<services>
+ <service name="download_files"/>
+</services>
+

_service:download_files:modules-4.7.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ab0a649e23b4dd00963e4cae60e573b449194ecb4035c5ce487330b272b4d06
+size 2073600

modules-4.5.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f46336f612553af5553d99347f387f733de0aaa0d80d4572e67615289382ec8
-size 1849421