parent
7bdbef3e92
commit
8fa333cebf
1
.gitignore
vendored
1
.gitignore
vendored
@ -22,3 +22,4 @@ modules-3.2.8.tar.bz2
|
|||||||
/modules-4.4.1.tar.bz2
|
/modules-4.4.1.tar.bz2
|
||||||
/modules-4.5.0.tar.bz2
|
/modules-4.5.0.tar.bz2
|
||||||
/modules-4.5.2.tar.bz2
|
/modules-4.5.2.tar.bz2
|
||||||
|
/modules-4.5.3.tar.bz2
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
Partially reverts https://github.com/cea-hpc/modules/commit/6a80cd9a460160fee96ed46b175b716989adbf27.
|
|
||||||
Fedora still uses rpm macros that add "--build=x86_64-redhat-linux-gnu" to the configure arguments
|
|
||||||
and since this configure is not a proper gnu one, it would always error out and never build.
|
|
||||||
|
|
||||||
See https://bugzilla.redhat.com/show_bug.cgi?id=1842562.
|
|
||||||
|
|
||||||
--- a/configure 2020-07-30 14:13:34.000000000 +0200
|
|
||||||
+++ b/configure 2020-08-03 16:06:37.137023909 +0200
|
|
||||||
@@ -598,8 +598,6 @@
|
|
||||||
--with-x|--without-x)
|
|
||||||
# pass argument supported by compat version to its ./configure script
|
|
||||||
compatarglist+="$arg " ;;
|
|
||||||
- *)
|
|
||||||
- echo_error "Unrecognized option \`$arg'" 1;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
@ -2,14 +2,13 @@
|
|||||||
%global vimdatadir %{_datadir}/vim/vimfiles
|
%global vimdatadir %{_datadir}/vim/vimfiles
|
||||||
|
|
||||||
Name: environment-modules
|
Name: environment-modules
|
||||||
Version: 4.5.2
|
Version: 4.5.3
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Provides dynamic modification of a user's environment
|
Summary: Provides dynamic modification of a user's environment
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://modules.sourceforge.net/
|
URL: http://modules.sourceforge.net/
|
||||||
Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
|
Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
|
||||||
Patch0001: environment-modules-configure.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: tcl-devel, tclx-devel, libX11-devel
|
BuildRequires: tcl-devel, tclx-devel, libX11-devel
|
||||||
@ -58,7 +57,6 @@ This package provides Environment Modules compatibility version (3.2).
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n modules-%{version}
|
%setup -q -n modules-%{version}
|
||||||
%patch0001 -p1
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -75,11 +73,11 @@ This package provides Environment Modules compatibility version (3.2).
|
|||||||
--with-initconf-in=etcdir \
|
--with-initconf-in=etcdir \
|
||||||
--with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles \
|
--with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles \
|
||||||
--with-quarantine-vars='LD_LIBRARY_PATH LD_PRELOAD'
|
--with-quarantine-vars='LD_LIBRARY_PATH LD_PRELOAD'
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=%{buildroot}
|
%make_install
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
|
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
|
||||||
mkdir -p %{buildroot}%{_datadir}/modulefiles
|
mkdir -p %{buildroot}%{_datadir}/modulefiles
|
||||||
@ -121,7 +119,7 @@ make test
|
|||||||
[ ! -L %{_mandir}/man4/modulefile.4.gz ] && rm -f %{_mandir}/man4/modulefile.4.gz
|
[ ! -L %{_mandir}/man4/modulefile.4.gz ] && rm -f %{_mandir}/man4/modulefile.4.gz
|
||||||
[ ! -L %{_sysconfdir}/profile.d/modules.sh ] && rm -f %{_sysconfdir}/profile.d/modules.sh
|
[ ! -L %{_sysconfdir}/profile.d/modules.sh ] && rm -f %{_sysconfdir}/profile.d/modules.sh
|
||||||
[ ! -L %{_sysconfdir}/profile.d/modules.csh ] && rm -f %{_sysconfdir}/profile.d/modules.csh
|
[ ! -L %{_sysconfdir}/profile.d/modules.csh ] && rm -f %{_sysconfdir}/profile.d/modules.csh
|
||||||
[ ! -L %{buildroot}%{_bindir}/modulecmd ] && rm -f %{_bindir}/modulecmd
|
[ ! -L %{_bindir}/modulecmd ] && rm -f %{_bindir}/modulecmd
|
||||||
|
|
||||||
# Migration from version 3.x to 4
|
# Migration from version 3.x to 4
|
||||||
if [ "$(readlink /etc/alternatives/modules.sh)" = '%{_datadir}/Modules/init/modules.sh' ]; then
|
if [ "$(readlink /etc/alternatives/modules.sh)" = '%{_datadir}/Modules/init/modules.sh' ]; then
|
||||||
@ -191,6 +189,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 2 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.3-1
|
||||||
|
- Update to 4.5.3 (#1874145)
|
||||||
|
+ Big thanks to Xavier Delaruelle for a spec patch!
|
||||||
|
|
||||||
* Mon Aug 3 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.2-1
|
* Mon Aug 3 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.2-1
|
||||||
- Update to 4.5.2 (#1842562)
|
- Update to 4.5.2 (#1842562)
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (modules-4.5.2.tar.bz2) = 9da6dc3af117719ab8285ffa662f973c7324daaa8d780b5bb8b6dea35c19ba198a11d7bba7db59d8ea11d6b2f97865e58388a5535889d8e63ac617ca008702ad
|
SHA512 (modules-4.5.3.tar.bz2) = 076bf16c6f75192490150bc4f4e30a464a381ef560819ff7bf1047304e9f4b94716aa80ed7d594756213b60d7c3cba1365df6965991b28f295f5b8d505a3f3b8
|
||||||
|
Loading…
Reference in New Issue
Block a user