rpms/environment-modules
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix 4.0.0 BuildRequires and Requires (#1503408)

Browse Source 
Also, fix installing manpages as alternatives.

Big thanks to Xavier Delaruelle for a spec patch!

Resolves: #1503408
This commit is contained in:
Jan Synacek 2017-11-21 08:49:25 +01:00
parent a663cb8c0c
commit cc548d2de6
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
environment-modules.spec
View File

@ -2,7 +2,7 @@
Name: environment-modules Name: environment-modules
Version: 4.0.0 Version: 4.0.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: Provides dynamic modification of a user's environment Summary: Provides dynamic modification of a user's environment
Group: System Environment/Base Group: System Environment/Base
@ -12,10 +12,8 @@ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.
Source4: macros.%{name} Source4: macros.%{name}
BuildRequires: tcl-devel, tclx-devel, libX11-devel BuildRequires: tcl-devel, tclx-devel, libX11-devel
BuildRequires: dejagnu BuildRequires: dejagnu, sed, hostname, man
BuildRequires: man Requires: tcl, sed, procps, man, hostname
#For ps in startup script
Requires: procps
Requires(post): %{_sbindir}/update-alternatives Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives
Provides: environment(modules) Provides: environment(modules)
@ -65,8 +63,7 @@ This package provides Environment Modules compatibility version (3.2).
--libexecdir=%{_datadir}/Modules/libexec \ --libexecdir=%{_datadir}/Modules/libexec \
--docdir=%{_docdir}/%{name} \ --docdir=%{_docdir}/%{name} \
--enable-dotmodulespath \ --enable-dotmodulespath \
--with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles \ --with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles
--with-quarantine-vars=LD_LIBRARY_PATH
make %{?_smp_mflags} make %{?_smp_mflags}
@ -123,7 +120,9 @@ fi
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
--install %{_sysconfdir}/profile.d/modules.sh modules.sh %{_datadir}/Modules/init/profile.sh 40 \ --install %{_sysconfdir}/profile.d/modules.sh modules.sh %{_datadir}/Modules/init/profile.sh 40 \
--slave %{_sysconfdir}/profile.d/modules.csh modules.csh %{_datadir}/Modules/init/profile.csh \ --slave %{_sysconfdir}/profile.d/modules.csh modules.csh %{_datadir}/Modules/init/profile.csh \
--slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd.tcl --slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd.tcl \
--slave %{_mandir}/man1/module.1.gz module.1.gz %{_mandir}/man1/module-c.1.gz \
--slave %{_mandir}/man4/modulefile.4.gz modulefile.4.gz %{_mandir}/man4/modulefile-c.4.gz
%post compat %post compat
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
@ -159,6 +158,8 @@ fi
%config(noreplace) %{_datadir}/Modules/init/.modulespath %config(noreplace) %{_datadir}/Modules/init/.modulespath
%{_datadir}/Modules/modulefiles %{_datadir}/Modules/modulefiles
%{_datadir}/modulefiles %{_datadir}/modulefiles
%ghost %{_mandir}/man1/module.1.gz
%ghost %{_mandir}/man4/modulefile.4.gz
%{_mandir}/man1/module-c.1.gz %{_mandir}/man1/module-c.1.gz
%{_mandir}/man4/modulefile-c.4.gz %{_mandir}/man4/modulefile-c.4.gz
%{macrosdir}/macros.%{name} %{macrosdir}/macros.%{name}
@ -171,6 +172,11 @@ fi
%changelog %changelog
* Tue Nov 21 2017 Jan Synáček <jsynacek@redhat.com> - 4.0.0-2
- Fix 4.0.0 BuildRequires and Requires (#1503408)
+ Big thanks to Xavier Delaruelle for a spec patch!
- Fix installing manpages as alternatives
* Mon Nov 20 2017 Jan Synáček <jsynacek@redhat.com> - 4.0.0-1 * Mon Nov 20 2017 Jan Synáček <jsynacek@redhat.com> - 4.0.0-1
- Update to 4.0.0 (#1503408) - Update to 4.0.0 (#1503408)