Fix environment-modules required on epel7

This commit is contained in:
sagitter 2017-02-26 17:38:15 +01:00
parent feeb5742f6
commit 9b5e2e2e18
2 changed files with 10 additions and 2 deletions

10
mp.spec
View File

@ -19,7 +19,7 @@
Name: mp
Version: 3.1.0
Release: 6.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
Release: 7.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
License: MIT and BSD
Summary: An open-source library for mathematical programming
URL: https://github.com/ampl/mp
@ -29,7 +29,12 @@ Patch0: %{name}-strtod.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1333344
Patch2: %{name}-%{version}-jni.patch
%if 0%{?rhel} && 0%{?rhel} >= 7
Requires: config(environment-modules)
%else
Requires: environment(modules)
%endif
BuildRequires: atlas-devel
%if 0%{?rhel}
BuildRequires: cmake3
@ -280,6 +285,9 @@ ctest --force-new-ctest-process --parallel %{?_smp_mflags}
%{_includedir}/mp
%changelog
* Sun Feb 26 2017 Antonio Trande <sagitter@fedoraproject.org.com> - 3.1.0-7.20160810git1f3980
- Fix environment-modules required on epel7
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-6.20161124git1f3980
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

View File

@ -1 +1 @@
fdebf2466e6834cbc6f2b4eab9e0e1d2 mp-1f39801af085656e4bf72250356a3a70d5d98e73.zip
SHA512 (mp-1f39801af085656e4bf72250356a3a70d5d98e73.zip) = 85138d93bd14b5701a79a7acd3ac70e3836873dcd94b0463a90ab841fe63d40d8303d695e19c80c5806b2d9cbda8f9abc7d67069a0ce39a620a496eb7f2ff86c