Hello community, here is the log from the commit of package Modules for openSUSE:Factory checked in at 2018-04-25 09:57:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Modules (Old) and /work/SRC/openSUSE:Factory/.Modules.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Modules" Wed Apr 25 09:57:16 2018 rev:22 rq:597449 version:4.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/Modules/Modules.changes 2014-12-03 22:49:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.Modules.new/Modules.changes 2018-04-25 09:57:20.719661310 +0200 @@ -1,0 +2,19 @@ +Tue Apr 17 11:13:53 UTC 2018 - bo...@steki.net + +- rolled back change from /usr/share/Modules (package name) to old + expected behavior /usr/share/modules +- fixed redhat/fedora builds + +------------------------------------------------------------------- +Mon Apr 16 19:24:51 UTC 2018 - bo...@steki.net + +- too many changes to put into changelog please read Changelog in + /usr/share/doc/packages/Modules-doc/ChangeLog (installed from + Modules-doc package) +- removed return.patch +- removed share.patch +- reworked return.patch and renamed to modules-4.1.2-return.patch +- reworked fixing-bashisms patch for current version + renamed modules-3.2.10-fix-bashisms.patch to modules-4.1.2-fix-bashisms.patch + +------------------------------------------------------------------- Old: ---- modules-3.2.10-fix-bashisms.patch modules-3.2.10.tar.bz2 return.patch share.patch New: ---- modules-4.1.2-fix-bashisms.patch modules-4.1.2-return.patch modules-4.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Modules.spec ++++++ --- /var/tmp/diff_new_pack.PGPzO4/_old 2018-04-25 09:57:26.039466161 +0200 +++ /var/tmp/diff_new_pack.PGPzO4/_new 2018-04-25 09:57:26.043466015 +0200 @@ -1,7 +1,7 @@ # # spec file for package Modules # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -18,24 +18,33 @@ Name: Modules BuildRequires: automake +BuildRequires: less +BuildRequires: procps BuildRequires: tcl-devel # xorg-x11-devel Url: http://modules.sourceforge.net/ -Version: 3.2.10 +Version: 4.1.2 Release: 0 -Summary: Environment Modules -License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ +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: tcl -Source: modules-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE share.patch -Patch0: share.patch -# PATCH-FIX-UPSTREAM return.patch -Patch1: return.patch -Patch2: modules-3.2.10-fix-bashisms.patch +Source: https://download.sourceforge.net/project/modules/Modules/modules-%{version}/modules-%{version}.tar.gz +# PATCH-FIX-UPSTREAM modules-4.1.2-return.patch +Patch1: modules-4.1.2-return.patch +# PATCH-FIX-UPSTREAM modules-4.1.2-fix-bashisms.patch +Patch2: modules-4.1.2-fix-bashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: environment-modules Obsoletes: environment-modules < %{version} +%if 0%{?suse_version} +Recommends: %{name}-doc +%endif + +%if 0%{?rhel_version} || 0%{?fedora_version} +BuildRequires: perl(Digest::MD5) +BuildRequires: perl(Exporter) +%endif %description The Modules package provides for dynamic modification of a user's @@ -49,44 +58,37 @@ collection to supplement or replace the shared module files. The modules environment is common on SGI/Crays and many workstation farms. +%package doc +Summary: Documentation for Change environment at runtime +Group: Documentation/Other +BuildArch: noarch - -Authors: --------- - John L. Furlan <j...@behere.com> - Peter W. Osel <p...@osel.de> - Jens Hamisch <jens.hami...@strawberry.com> - R.K. Owen <r...@owen.sj.ca.us> +%description doc +The Modules package provides for dynamic modification of a user's +environment with module files. Each module file contains the +information needed to configure the shell for an application. Once the +package is initialized, the environment can be modified dynamically on +a per-module basis using the module command that interprets module +files. Typically, module files instruct the module command to alter or +set shell environment variables, such as PATH or MANPATH. Module files +may be shared by many users on a system and users may have their own +collection to supplement or replace the shared module files. The +modules environment is common on SGI/Crays and many workstation farms. %prep %setup -q -n modules-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch1 +%patch2 +sed -i 's@/usr/bin/env bash@/bin/bash@' contrib/envml %build -# Remove overzealous use of "dnl" (+++), which caused -# a broken "configure" (---) being generated. -#@@ -3004,7 +3004,8 @@ to "yes", and re-run configure. -# END -# as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 -# fi -#-fiac_config_headers="$ac_config_headers config.h" -#+fi -#+ac_config_headers="$ac_config_headers config.h" -# -# # Check whether --enable-versioning was given. -# if test "${enable_versioning+set}" = set; then : -# -perl -i -pe 's{dnl\n}{\n}gs' configure.ac - -aclocal --force -I config -autoreconf --force --install CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE" \ ./configure \ + --initdir="%{_datadir}/%name/init" \ + --libexecdir="%{_prefix}/%_lib/%{name}/" \ --prefix="%_prefix" \ - --with-version-path="%_datadir/modules" \ - --with-module-path="%_datadir/modules/modulefiles" \ + --with-version-path="%_datadir/%{name}" \ + --modulefilesdir="%{_datadir}/modules" \ --mandir=%{_mandir} \ --with-etc-path="%_sysconfdir" \ --with-skel-path="%_sysconfdir/skel" \ @@ -97,29 +99,32 @@ %install install -d $RPM_BUILD_ROOT/usr/share/modules install -d $RPM_BUILD_ROOT/etc/profile.d -install -m 644 etc/global/profile.modules $RPM_BUILD_ROOT/etc/profile.d/modules.sh -install -m 644 etc/global/csh.modules $RPM_BUILD_ROOT/etc/profile.d/modules.csh -sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.sh -sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.csh - make DESTDIR=$RPM_BUILD_ROOT install install -d $RPM_BUILD_ROOT/usr/bin -pushd $RPM_BUILD_ROOT/usr/bin -ln -s ../share/Modules/%{version}/bin/add.modules . -ln -s ../share/Modules/%{version}/bin/mkroot . -ln -s ../share/Modules/%{version}/bin/modulecmd . -popd +mv $RPM_BUILD_ROOT/usr/share/doc doc_dir %files %defattr(-,root,root) -%doc ChangeLog LICENSE.GPL NEWS README TODO -%dir %{_prefix}/share/Modules -%{_prefix}/share/Modules/* -%dir /usr/share/modules -/usr/share/modules/* -%{_bindir}/* -%config /etc/profile.d/modules.* -%doc %{_mandir}/man4/* -%doc %{_mandir}/man1/* +%doc doc_dir/README +%dir %{_libdir}/%{name} +%dir %{_datadir}/%{name} +%dir %{_datadir}/modules +%{_bindir}/add.modules +%{_bindir}/envml +%{_bindir}/mkroot +%{_bindir}/modulecmd +%{_datadir}/%{name}/init +%{_libdir}/%{name}/modulecmd-compat +%{_libdir}/%{name}/modulecmd.tcl +%{_datadir}/modules/* +%{_mandir}/man1/module-compat.1* +%{_mandir}/man1/module.1* +%{_mandir}/man4/modulefile-compat.4* +%{_mandir}/man4/modulefile.4* + +%files doc +%defattr(-,root,root) +%doc doc_dir/COPYING.GPLv2 doc_dir/ChangeLog doc_dir/ChangeLog-compat doc_dir/INSTALL.txt doc_dir/example.txt +%doc doc_dir/MIGRATING.txt doc_dir/NEWS-compat doc_dir/NEWS.txt doc_dir/README doc_dir/diff_v3_v4.txt %changelog ++++++ modules-3.2.10-fix-bashisms.patch -> modules-4.1.2-fix-bashisms.patch ++++++ --- /work/SRC/openSUSE:Factory/Modules/modules-3.2.10-fix-bashisms.patch 2014-12-03 22:49:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.Modules.new/modules-4.1.2-fix-bashisms.patch 2018-04-25 09:57:22.319602618 +0200 @@ -1,7 +1,8 @@ -diff -Ndur modules-3.2.10/etc/add.modules.in modules-3.2.10-fix-bashisms/etc/add.modules.in ---- modules-3.2.10/etc/add.modules.in 2012-11-02 00:22:06.000000000 +0200 -+++ modules-3.2.10-fix-bashisms/etc/add.modules.in 2014-11-16 22:48:55.863380526 +0200 -@@ -114,7 +114,7 @@ +Index: compat/etc/add.modules.in +=================================================================== +--- compat/etc/add.modules.in.orig 2018-03-31 18:22:47.000000000 +0200 ++++ compat/etc/add.modules.in 2018-04-16 21:28:35.703722251 +0200 +@@ -114,7 +114,7 @@ fi findload $1.old /bin/cat > $1 <<! if ( -e $ETC/csh.modules ) then ++++++ modules-4.1.2-return.patch ++++++ Index: compat/ModuleCmd_Avail.c =================================================================== --- compat/ModuleCmd_Avail.c.orig 2018-03-31 18:22:47.000000000 +0200 +++ compat/ModuleCmd_Avail.c 2018-04-16 21:08:24.521845828 +0200 @@ -690,6 +690,7 @@ static int check_cache( char *dir) static int test_version_dir( struct dirent *dp) { + return 0; } /*++++ ** ** Function-Header ***************************************************** **
