Hello community, here is the log from the commit of package lua-lmod for openSUSE:Factory checked in at 2018-08-28 09:24:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua-lmod (Old) and /work/SRC/openSUSE:Factory/.lua-lmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua-lmod" Tue Aug 28 09:24:24 2018 rev:13 rq:630003 version:7.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/lua-lmod/lua-lmod.changes 2018-04-19 15:32:14.844259052 +0200 +++ /work/SRC/openSUSE:Factory/.lua-lmod.new/lua-lmod.changes 2018-08-28 09:24:24.948822651 +0200 @@ -1,0 +2,98 @@ +Fri Aug 17 19:38:08 UTC 2018 - [email protected] + +- Update to 7.8.1: + * Fixed typo in myGlobals.lua about assigning LMOD_DUPLICATE_PATHS + * Fixed TARG_TITLE_BAR_PAREN to always have a value, needed for tcsh. + * Added LMOD_SETTARG_TITLE_BAR=yes to turn on the title bar. + * Changed from sn-version to sn/version in title bar. + * Changed the initialization of LMOD_SETTARG_CMD in bash.in and csh.in. + It is defined to be `:' iff it is undefined. This allows settarg to work + in sub-shells. + * Use spider cache for "module --terse avail" when LMOD_CACHED_LOADS=yes + * Fix bug with LMOD_SETTARG_CMD and csh. + * Turn off LMOD_REDIRECT for tcsh + Settarg now supports C/N/V and N/V/V module layouts. + * Fixed a bug where sometimes a compiler-mpi dependent module wouldn't + be found when it should. + * Fixed issue #321 Changed LMOD_TARGPATHLOC to LMOD_SETTARG_TARG_PATH_LOCATION + changed LMOD_FULL_SETTARG_SUPPORT to LMOD_SETTARG_FULL_SUPPORT. (Lmod supports both) + * Fixed issue #322 where non-existant directory would cause problems + * Fix bug in settarg module for csh. + * Fix bug in Csh.lua where semicolons inside an alias were removed. Only remove the + trailing semicolon. + * Generate an LmodError() if the cachefile is broken. + * Do not convert /foo/bar/../baz to /foo/baz. Leave .. in paths. Fixes issue #324 + * The admin.list (aka, nag mesages) supports Lua regex's. Responds to issue #326 + * The admin.list now supports multiple targets for the same message (issue #326) + * Use full path_regularize() on all TCL program files. Having paths like /a/b/../d + caused problems for some users when interacting with TCL. + * Do not look for lua_json. Just use the one that comes with Lmod. + * Fix sh_to_modulefile correctly handle bad options (issue #332) + * Allow pushenv("FOO",false) to clear "FOO" (issue #331) + * Always use ref counting for MODULEPATH. + * Change the C-shell output to not use quotes and instead use back slashes to + quote special characters like $. + * Better filtering for c-shell output testing + * Fix bug in sh_to_modulefile + * Remove definition of SHOST from bash.in. Recompute it in settarg module. + * Support relative symlink when trying to find cmd_dir + * Now get modify time correctly from SpiderCache timestamp file. + * Issue #346: do not use "ls" to get the list of directories when dealing with .modulepath + * Issue #347: Just skip parsing "whole" if it is not a string (settarg) + * Issue #348: Do not double the colon when the original was a single colon + * Change ml so that ml av --terse is an error. + * Making the settarg and lmod modulefiles be installed versionless. + * Issue #353: Fix bug in cshrc.in end -> endif + * Issue #352: Allow sites to control the prefix completely. + * luaposix 34.0.4-1 wants to use setfenv() which only exists in Lua 5.1 and not in Lua 5.2+ + so Lmod now requires("posix") outside of strict. + * Build lua-term in the correct location when --with-siteControlPrefix=yes + * issue #347: Remove ./?.lua, ./?/init.lua from LUA_PATH and ./?.so from LUA_CPATH + * issue #357: Add missing semicolons in settarg.version.lua + * Fixed bug with lib directories not being readable. + * issue #355: Make LMOD_RC support a colon separated list of possible lmodrc.lua files + * Make bash, zsh and csh form LMOD_PKG to use <prefix>/lmod/lmod instead of + <prefix>/lmod/<lmod_version> when allowing sites to completely control prefix (issue #352) + * issue #359: Lmod can now use the internal version of lfs for installation. + * issue #361: Support make -j install added. + * issue #362: Trying to fix problem with RPM builds of Lmod at UGENT. + * issue #358: Improved error msg when there is a syntax error in a modulefile. + * issue #365, #366: Fix typo in Makefile about pkgs. + * Modify end2end test to use build-in lua pkgs only. + * issue #370: Allow for exact match with fn and fullName w/o regex pattern matching + added % quoting for '-' in docs. + * Support for making lmod silence shell debug output (when doing set -xv for bash or zsh) + The command "make world_update" now marks the latest release as the latest release at + github.com/TACC/Lmod + * The new module command now returns the status from the eval of the lmod command + * Block .version.version and .modulerc.version files from being included in DirTree + * Bash like shells now output without double quotes. + * Fix fish shell output for path and infopath. Fix shell function output for zsh/bash + * issue #374: convert ~ to $HOME internally. This allows C-shell users to use ~ + inside a modulefile and have it work when unloading. + * issue #375: Support for is-loaded and is-avail added. + * Do not convert LMOD_PKG from /opt/apps/lmod/7.7.35 to /opt/apps/lmod/lmod if the link exists. + * When building reverseMap also take abspath(path) and store it if different. + * Now make startup scripts (profile.in, cshrc.in, profile.fish.in) use PKGV instead of PKG so + that the pre-install create $VERSION files. The install target will convert them to PKG. + * Check for "g" tools like gbasename, gexpr as well as the regular basename, expr etc. + * General support for the modulerc files to be written in lua. They have a .lua extension. + * Bug fix for 7.7.38 where it did not work for Lua 5.1 + +------------------------------------------------------------------- +Fri Aug 17 18:20:09 UTC 2018 - [email protected] + +- Change %license to a %my_license macro to be able to + build for the HPC module on SLE-12. + +------------------------------------------------------------------- +Fri Aug 17 18:00:24 UTC 2018 - [email protected] + +- Move doc and man page building into separate flavors. + +------------------------------------------------------------------- +Wed Apr 18 19:53:39 UTC 2018 - [email protected] + +- use license macro for License file. + +------------------------------------------------------------------- Old: ---- lua-lmod-7.6.1.tar.gz New: ---- _multibuild lua-lmod-7.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua-lmod.spec ++++++ --- /var/tmp/diff_new_pack.lNyEUT/_old 2018-08-28 09:24:25.460824249 +0200 +++ /var/tmp/diff_new_pack.lNyEUT/_new 2018-08-28 09:24:25.464824262 +0200 @@ -16,6 +16,25 @@ # +%global flavor @BUILD_FLAVOR@%{nil} + +%if "%flavor" == "" +%undefine build_doc +%undefine build_man +%endif + +%if "%flavor" == "doc-pdf" +%define build_pdf 1 +%endif + +%if "%flavor" == "doc-man" +%define build_man 1 +%endif + +%if 0%{?build_pdf:1} || 0%{?build_man:1} +%define build_doc 1 +%endif + # %define ohpc 0 @@ -29,7 +48,7 @@ Summary: Lua-based Environment Modules License: MIT Group: Development/Libraries/Other -Version: 7.6.1 +Version: 7.8.1 Release: 0 Url: https://github.com/TACC/Lmod %if 0%{?ohpc} @@ -42,15 +61,25 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{!?build_doc:1} BuildRequires: lua >= %{lua_version} BuildRequires: lua-devel >= %{lua_version} BuildRequires: lua-luafilesystem BuildRequires: lua-luaposix BuildRequires: lua-luaterm BuildRequires: procps -BuildRequires: python-Sphinx BuildRequires: rsync BuildRequires: tcl +Requires: lua >= %{lua_version} +Requires: lua-luafilesystem +Requires: lua-luaposix +Requires: lua-luaterm +Requires: tcl +Recommends: lua-lmod-man +Conflicts: Modules +%else +BuildRequires: python-Sphinx +%if 0%{?build_pdf:1} BuildRequires: texlive BuildRequires: texlive-babel BuildRequires: texlive-babel-english @@ -78,15 +107,11 @@ BuildRequires: texlive-upquote BuildRequires: texlive-varwidth BuildRequires: texlive-wrapfig -Requires: lua >= %{lua_version} -Requires: lua-luafilesystem -Requires: lua-luaposix -Requires: lua-luaterm -Requires: tcl -Conflicts: Modules %if 0%{?sle_version} == 0 || 0%{?sle_version} >= 120300 BuildRequires: python-Sphinx-latex %endif +%endif # %%build_pdf +%endif # %%build_doc %description Lmod is an Environment Module System based on Lua, Reads TCL Modules, @@ -97,7 +122,14 @@ Group: Documentation/PDF %description doc -Documentation (PDF) for the Lmod Environment Modules System. +Documentation (pdf) for the Lmod Environment Modules System. + +%package man +Summary: Manual page for Lmod +Group: Documentation/Man + +%description man +Documentation (man) for the Lmod Environment Modules System %prep %setup -q -n Lmod-%{version} @@ -107,6 +139,7 @@ %endif %build +%if 0%{!?build_doc:1} export LUA_CPATH="%{lua_cpath}" export LUA_PATH="%{lua_path}" %configure --prefix=%{_datadir} \ @@ -117,9 +150,12 @@ --with-autoSwap=no make find my_docs/ -name .gitignore -delete -cd docs; make latexpdf man; cd .. +%else +cd docs; make %{?build_pdf:latexpdf} %{?build_man:man}; cd .. +%endif %install +%if 0%{!?build_doc:1} export LUA_CPATH="%{lua_cpath}" export LUA_PATH="%{lua_path}" %make_install @@ -134,7 +170,6 @@ mkdir -p %{buildroot}%{lua_lmod_admin_modulesdir} mkdir -p %{buildroot}%{lua_lmod_moduledeps} mkdir -p %{buildroot}/%{_mandir}/man1 -install -p -m644 docs/build/man/lmod.1 %{buildroot}/%{_mandir}/man1/ # Fix exec warning chmod u+x %{buildroot}%{_datadir}/lmod/%{version}/libexec/ignore_dirs_converter @@ -213,9 +248,24 @@ module try-add suse-hpc EOF +%else # %%build_docs + %if 0%{?build_man} +mkdir -p %{buildroot}/%{_mandir}/man1 +install -p -m644 docs/build/man/lmod.1 %{buildroot}/%{_mandir}/man1/ + %endif +%endif + +%if 0%{?sle_version} > 120200 || 0%{?suse_version} > 1320 +%define my_license %license +%else +%define my_license %doc +%endif +%if 0%{!?build_doc:1} %files %defattr(-,root,root,-) +%my_license License +%doc README.* %config %{_sysconfdir}/profile.d/lmod.sh %config %{_sysconfdir}/profile.d/lmod.csh %config %{_sysconfdir}/rpm/macros.lmod @@ -224,13 +274,22 @@ %dir %{lua_lmod_admin_modulesdir} %dir %{lua_lmod_moduledeps} %{_datadir}/lmod/* -%{_mandir}/man1/lmod.1.* -%doc License -%doc README.* +%else # %%build_docs + +%if 0%{?build_pdf} %files doc %defattr(-,root,root,-) %doc my_docs/*.txt my_docs/*.pdf my_docs/*.md %doc docs/build/latex/Lmod.pdf +%endif + +%if 0%{?build_man} +%files man +%defattr(-,root,root,-) +%{_mandir}/man1/lmod.1.* +%endif + +%endif # %%build_docs %changelog ++++++ Messages-Remove-message-about-creating-a-consulting-ticket.patch ++++++ --- /var/tmp/diff_new_pack.lNyEUT/_old 2018-08-28 09:24:25.480824312 +0200 +++ /var/tmp/diff_new_pack.lNyEUT/_new 2018-08-28 09:24:25.480824312 +0200 @@ -1,8 +1,8 @@ From: Egbert Eich <[email protected]> -Date: Fri Oct 6 14:55:32 2017 +0200 +Date: Fri Aug 17 21:31:37 2018 +0200 Subject: [Messages] Remove message about creating a consulting ticket. Patch-mainline: never -Git-commit: 625f56ad64cbdcd968e137caa69d84c26c55be5a +Git-commit: a116d2da370874292fb2a5ab6e884eb425c99728 References: Signed-off-by: Egbert Eich <[email protected]> @@ -10,14 +10,13 @@ messageDir/de.lua | 4 +--- messageDir/en.lua | 4 +--- messageDir/es.lua | 4 +--- - messageDir/fr.lua | 5 +---- - src/MessageT.lua | 4 +--- - 5 files changed, 5 insertions(+), 16 deletions(-) + messageDir/fr.lua | 4 +--- + 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/messageDir/de.lua b/messageDir/de.lua -index caeb725..23b1b6e 100644 +index 5b30c7e..f4c3c99 100644 --- a/messageDir/de.lua +++ b/messageDir/de.lua -@@ -100,9 +100,7 @@ Es ist auch möglich, dass Ihr Cache veraltet ist. Versuchen Sie: +@@ -103,9 +103,7 @@ Es ist auch möglich, dass Ihr Cache veraltet ist. Versuchen Sie: Es ist bereits "%{oldName}" geladen. Verwenden Sie folgendes Kommando, um das Modul zu laden: @@ -26,13 +25,13 @@ -Falls Sie weitere Unterstützung brauchen, erstellen Sie ein Support-Ticket. + $ module swap %{oldName} %{fullName}. ]==], + e_Illegal_Load = nil, e_LocationT_Srch = "Fehler in \"LocationT:search()\".", - e_Missing_Value = "%{func}(\"%{name}\") ist ungültig. Es wird ein Wert benötigt.", diff --git a/messageDir/en.lua b/messageDir/en.lua -index cf07924..e08be29 100644 +index 0f4a37f..1f1ed00 100644 --- a/messageDir/en.lua +++ b/messageDir/en.lua -@@ -107,9 +107,7 @@ Also make sure that all modulefiles written in TCL start with the string #%Modul +@@ -116,9 +116,7 @@ Also make sure that all modulefiles written in TCL start with the string #%Modul You already have %{oldName} loaded. To correct the situation, please execute the following command: @@ -41,13 +40,13 @@ -Please submit a consulting ticket if you require additional assistance. + $ module swap %{oldName} %{fullName}. ]==], - e_LocationT_Srch = "Error in LocationT:search().", - e_Missing_Value = "%{func}(\"%{name}\") is not valid; a value is required.", + e_Illegal_Load = [==[The following module(s) are illegal: %{module_list} + Lmod does not support modulefiles that start with two or more underscores diff --git a/messageDir/es.lua b/messageDir/es.lua -index e37e4a1..983e64f 100644 +index 967ab80..f3df4ad 100644 --- a/messageDir/es.lua +++ b/messageDir/es.lua -@@ -78,9 +78,7 @@ También es posible que su archivo de cache estea desactualizado. Intente: +@@ -81,9 +81,7 @@ También es posible que su archivo de cache estea desactualizado. Intente: Ya tiene %{oldName} cargado. Para solucionar esta situación, introduzca el siguiente comando: @@ -56,36 +55,20 @@ -Por favor, envíe un ticket si necesita más ayuda. + $ module swap %{oldName} %{fullName}. ]==], + e_Illegal_Load = nil, e_LocationT_Srch = "Error in LocationT:search()", - e_Missing_Value = "%{func}(\"%{name}\") no es válido, es necesario un valor", diff --git a/messageDir/fr.lua b/messageDir/fr.lua -index 2098e90..2fef1f9 100644 +index f587371..8d001fb 100644 --- a/messageDir/fr.lua +++ b/messageDir/fr.lua -@@ -105,10 +105,7 @@ Il est aussi possible que votre cache soit désuète. Essayez : +@@ -108,9 +108,7 @@ Il est aussi possible que votre cache soit désuète. Essayez : %{oldName} est déjà chargé. Pour corriger le problème, vous pouvez utiliser la commande suivante : - $ module swap %{oldName} %{fullName} - -Merci de bien vouloir soumettre un ticket si vous désirez plus d'assistance. -- + $ module swap %{oldName} %{fullName}. - ]==], - e_LocationT_Srch = "Erreur dans la fonction 'LocationT:search()'", - e_Missing_Value = "%{func}(\"%{name}\") n'est pas valide, une valeur est requise", -diff --git a/src/MessageT.lua b/src/MessageT.lua -index 542a346..01171d5 100644 ---- a/src/MessageT.lua -+++ b/src/MessageT.lua -@@ -25,9 +25,7 @@ Alternatively, you can set the environment variable LMOD_DISABLE_SAME_NAME_AUTOS - You already have %{oldName} loaded. - To correct the situation, please enter the following command: -- $ module swap %{oldName} %{fullName} -- --Please submit a consulting ticket if you require additional assistance. -+ $ module swap %{oldName} %{fullName}. ]==], - e_setStandardPaths = "Unknown Key: \"%{key}\" in setStandardPaths\n", - e_No_Matching_Mods = "No matching modules found\n", + e_Illegal_Load = nil, ++++++ _multibuild ++++++ <multibuild> <package>doc-pdf</package> <package>doc-man</package> </multibuild> ++++++ lua-lmod-7.6.1.tar.gz -> lua-lmod-7.8.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/lua-lmod/lua-lmod-7.6.1.tar.gz /work/SRC/openSUSE:Factory/.lua-lmod.new/lua-lmod-7.8.1.tar.gz differ: char 13, line 1
