Hello community, here is the log from the commit of package lua-lmod for openSUSE:Factory checked in at 2017-06-12 15:34:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua-lmod (Old) and /work/SRC/openSUSE:Factory/.lua-lmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua-lmod" Mon Jun 12 15:34:23 2017 rev:3 rq:502809 version:6.5.11 Changes: -------- --- /work/SRC/openSUSE:Factory/lua-lmod/lua-lmod.changes 2017-04-12 18:14:32.776125819 +0200 +++ /work/SRC/openSUSE:Factory/.lua-lmod.new/lua-lmod.changes 2017-06-12 15:34:28.279101016 +0200 @@ -1,0 +2,5 @@ +Fri Apr 28 17:49:00 UTC 2017 - e...@suse.com + +- Add profile files for bash and csh. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua-lmod.spec ++++++ --- /var/tmp/diff_new_pack.diGLa5/_old 2017-06-12 15:34:29.214969020 +0200 +++ /var/tmp/diff_new_pack.diGLa5/_new 2017-06-12 15:34:29.214969020 +0200 @@ -1,7 +1,7 @@ # # spec file for package lua-lmod # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +# +%define ohpc 0 + %define lua_lmod_modulesdir %{_datarootdir}/lmod/modulefiles %define lua_lmod_admin_modulesdir %{_datarootdir}/lmod/admin/modulefiles %define lua_lmod_moduledeps %{_datarootdir}/lmod/moduledeps @@ -23,12 +27,15 @@ Name: lua-lmod Summary: Lua based Environment Modules -Version: 6.5.11 -Release: 0 License: MIT Group: Development/Libraries/Other +Version: 6.5.11 +Release: 0 Url: https://github.com/TACC/Lmod BuildArch: noarch +%if 0%{?ohpc} +BuildRequires: ohpc +%endif Source0: https://github.com/TACC/Lmod/archive/%{version}.tar.gz#$/%{name}-%{version}.tar.gz Patch1: lmod.consulting.patch @@ -41,33 +48,33 @@ BuildRequires: lua-luafilesystem BuildRequires: lua-luaposix BuildRequires: lua-luaterm -BuildRequires: rsync -BuildRequires: tcl BuildRequires: procps BuildRequires: python-Sphinx +BuildRequires: rsync +BuildRequires: tcl %if 0%{?sle_version} == 0 || 0%{?sle_version} > 121000 BuildRequires: python-Sphinx-latex %endif BuildRequires: texlive -BuildRequires: texlive-threeparttable -BuildRequires: texlive-multirow -BuildRequires: texlive-wrapfig -BuildRequires: texlive-upquote -BuildRequires: texlive-cmap BuildRequires: texlive-babel BuildRequires: texlive-babel-english -BuildRequires: texlive-psnfss -BuildRequires: texlive-fancyhdr +BuildRequires: texlive-cmap +BuildRequires: texlive-courier +BuildRequires: texlive-dvips BuildRequires: texlive-fancybox -BuildRequires: texlive-titlesec -BuildRequires: texlive-framed +BuildRequires: texlive-fancyhdr BuildRequires: texlive-fancyvrb +BuildRequires: texlive-framed +BuildRequires: texlive-helvetic BuildRequires: texlive-mdwtools +BuildRequires: texlive-multirow BuildRequires: texlive-parskip +BuildRequires: texlive-psnfss +BuildRequires: texlive-threeparttable BuildRequires: texlive-times -BuildRequires: texlive-helvetic -BuildRequires: texlive-courier -BuildRequires: texlive-dvips +BuildRequires: texlive-titlesec +BuildRequires: texlive-upquote +BuildRequires: texlive-wrapfig Requires: lua >= %{lua_version} Requires: lua-luafilesystem @@ -133,8 +140,76 @@ rm -f %{buildroot}/%{_datadir}/lmod/%{version}/settarg/Version.lua ln -s %{_datadir}/lmod/%{version}/libexec/Version.lua %{buildroot}/%{_datadir}/lmod/%{version}/settarg/Version.lua +mkdir -p %{buildroot}/%{_sysconfdir}/profile.d +%{__cat} <<EOF > %{buildroot}/%{_sysconfdir}/profile.d/lmod.sh +# -*- shell-script -*- +######################################################################## +# This is the system wide source file for setting up +# modules: +# +######################################################################## + +# NOOP if running under known resource manager +if [ ! -z "\$SLURM_NODELIST" ];then + return +fi + +export LMOD_SETTARG_CMD=":" +export LMOD_FULL_SETTARG_SUPPORT=no +export LMOD_COLORIZE=no +export LMOD_PREPEND_BLOCK=normal + +if [ \$EUID -eq 0 ]; then + export MODULEPATH=%{?OHPC_MODULES:%{OHPC_ADMIN}/modulefiles:%{OHPC_MODULES}:}%{lua_lmod_admin_modulesdir}:%{lua_lmod_modulesdir} +else + export MODULEPATH=%{?OHPC_MODULES:%{OHPC_MODULES}:}%{lua_lmod_modulesdir} +fi + +export BASH_ENV=%{_datadir}/lmod/%{version}/init/bash + +# Initialize modules system +. \${BASH_ENV} >/dev/null + +# Load baseline OpenHPC environment +module try-add ohpc + +EOF + +%{__cat} <<EOF > %{buildroot}/%{_sysconfdir}/profile.d/lmod.csh +# -*- shell-script -*- +######################################################################## +# This is the system wide source file for setting up +# modules: +# +######################################################################## + +if ( \$?SLURM_NODELIST ) then + exit 0 +endif + +setenv LMOD_SETTARG_CMD ":" +setenv LMOD_FULL_SETTARG_SUPPORT "no" +setenv LMOD_COLORIZE "no" +setenv LMOD_PREPEND_BLOCK "normal" + +if ( \`id -u\` == "0" ) then + setenv MODULEPATH "%{?OHPC_MODULES:%{OHPC_ADMIN}/modulefiles:%{OHPC_MODULES}:}%{lua_lmod_admin_modulesdir}:%{lua_lmod_modulesdir}" +else + setenv MODULEPATH "%{?OHPC_MODULES:%{OHPC_MODULES}:}%{lua_lmod_modulesdir}" +endif + +# Initialize modules system +source %{_datadir}/lmod/%{version}/init/csh >/dev/null + +# Load baseline OpenHPC environment +module try-add ohpc + +EOF + %files %defattr(-,root,root,-) +%config %{_sysconfdir}/profile.d/lmod.sh +%config %{_sysconfdir}/profile.d/lmod.csh %config %{_sysconfdir}/rpm/macros.lmod %dir %{_datadir}/lmod %dir %{lua_lmod_modulesdir}
