Update to 3.1.0
This commit is contained in:
parent
302a83e567
commit
99d83ecd01
|
@ -1,2 +1,3 @@
|
|||
/mp-35060ba2a59f2b0f0fd622ed9df678f142f846ed.tar.gz
|
||||
/mp-9fdb5147068f3b719999210e56b493327f1ca5e7.zip
|
||||
/mp-3.1.0.tar.gz
|
||||
|
|
|
@ -1,4 +1,86 @@
|
|||
diff -up mp-9fdb5147068f3b719999210e56b493327f1ca5e7/src/asl/solvers/asl.h.orig mp-9fdb5147068f3b719999210e56b493327f1ca5e7/src/asl/solvers/asl.h
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
|
||||
<head>
|
||||
<title>rpms/mp.git - mp</title>
|
||||
<meta name='generator' content='cgit v0.12'/>
|
||||
<meta name='robots' content='index, nofollow'/>
|
||||
<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
|
||||
<link rel='shortcut icon' href='/favicon.ico'/>
|
||||
<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/mp.git/atom/mp-strtod.patch?h=master' type='application/atom+xml'/>
|
||||
<link rel='vcs-git' href='git://pkgs.fedoraproject.org/rpms/mp.git' title='rpms/mp.git Git repository'/>
|
||||
<link rel='vcs-git' href='ssh://pkgs.fedoraproject.org/rpms/mp.git' title='rpms/mp.git Git repository'/>
|
||||
<link rel='vcs-git' href='http://pkgs.fedoraproject.org/git/rpms/mp.git' title='rpms/mp.git Git repository'/>
|
||||
</head>
|
||||
<body>
|
||||
<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script>
|
||||
<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script>
|
||||
|
||||
<script>
|
||||
var base = 'https://apps.fedoraproject.org/';
|
||||
var tokens = window.location.href.split('/');
|
||||
var repo = null;
|
||||
if (tokens.length > 4 && tokens[4] != '') {
|
||||
repo = tokens[4].split('.')[0];
|
||||
}
|
||||
fedmenu({
|
||||
'url': base + 'js/data.js',
|
||||
'mimeType': 'application/javascript',
|
||||
'position': 'bottom-right',
|
||||
'package': repo,
|
||||
});
|
||||
</script>
|
||||
<div id='cgit'><table id='header'>
|
||||
<tr>
|
||||
<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
|
||||
<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/mp.git' href='/cgit/rpms/mp.git/'>rpms/mp.git</a></td><td class='form'><form method='get' action=''>
|
||||
<select name='h' onchange='this.form.submit();'>
|
||||
<option value='epel7'>epel7</option>
|
||||
<option value='f22'>f22</option>
|
||||
<option value='f23'>f23</option>
|
||||
<option value='f24'>f24</option>
|
||||
<option value='master' selected='selected'>master</option>
|
||||
<option value='mp2'>mp2</option>
|
||||
</select> <input type='submit' name='' value='switch'/></form></td></tr>
|
||||
<tr><td class='sub'>mp</td><td class='sub right'>Jon Ciesla</td></tr></table>
|
||||
<table class='tabs'><tr><td>
|
||||
<a href='/cgit/rpms/mp.git/'>summary</a><a href='/cgit/rpms/mp.git/refs/'>refs</a><a href='/cgit/rpms/mp.git/log/mp-strtod.patch'>log</a><a class='active' href='/cgit/rpms/mp.git/tree/mp-strtod.patch'>tree</a><a href='/cgit/rpms/mp.git/commit/mp-strtod.patch'>commit</a><a href='/cgit/rpms/mp.git/diff/mp-strtod.patch'>diff</a><a href='/cgit/rpms/mp.git/stats/mp-strtod.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/mp.git/log/mp-strtod.patch'>
|
||||
<select name='qt'>
|
||||
<option value='grep'>log msg</option>
|
||||
<option value='author'>author</option>
|
||||
<option value='committer'>committer</option>
|
||||
<option value='range'>range</option>
|
||||
</select>
|
||||
<input class='txt' type='text' size='10' name='q' value=''/>
|
||||
<input type='submit' value='search'/>
|
||||
</form>
|
||||
</td></tr></table>
|
||||
<div class='path'>path: <a href='/cgit/rpms/mp.git/tree/'>root</a>/<a href='/cgit/rpms/mp.git/tree/mp-strtod.patch'>mp-strtod.patch</a></div><div class='content'>blob: f01b748aef5cc0614b25d60ec73df0db0c5f3ab4 (<a href='/cgit/rpms/mp.git/plain/mp-strtod.patch'>plain</a>)
|
||||
<table summary='blob content' class='blob'>
|
||||
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
|
||||
<a id='n2' href='#n2'>2</a>
|
||||
<a id='n3' href='#n3'>3</a>
|
||||
<a id='n4' href='#n4'>4</a>
|
||||
<a id='n5' href='#n5'>5</a>
|
||||
<a id='n6' href='#n6'>6</a>
|
||||
<a id='n7' href='#n7'>7</a>
|
||||
<a id='n8' href='#n8'>8</a>
|
||||
<a id='n9' href='#n9'>9</a>
|
||||
<a id='n10' href='#n10'>10</a>
|
||||
<a id='n11' href='#n11'>11</a>
|
||||
<a id='n12' href='#n12'>12</a>
|
||||
<a id='n13' href='#n13'>13</a>
|
||||
<a id='n14' href='#n14'>14</a>
|
||||
<a id='n15' href='#n15'>15</a>
|
||||
<a id='n16' href='#n16'>16</a>
|
||||
<a id='n17' href='#n17'>17</a>
|
||||
<a id='n18' href='#n18'>18</a>
|
||||
<a id='n19' href='#n19'>19</a>
|
||||
<a id='n20' href='#n20'>20</a>
|
||||
<a id='n21' href='#n21'>21</a>
|
||||
<a id='n22' href='#n22'>22</a>
|
||||
</pre></td>
|
||||
<td class='lines'><pre><code>diff -up mp-9fdb5147068f3b719999210e56b493327f1ca5e7/src/asl/solvers/asl.h.orig mp-9fdb5147068f3b719999210e56b493327f1ca5e7/src/asl/solvers/asl.h
|
||||
--- mp-9fdb5147068f3b719999210e56b493327f1ca5e7/src/asl/solvers/asl.h.orig 2016-03-16 18:16:10.961987586 -0300
|
||||
+++ mp-9fdb5147068f3b719999210e56b493327f1ca5e7/src/asl/solvers/asl.h 2016-03-16 18:17:21.067990271 -0300
|
||||
@@ -1104,17 +1104,7 @@ QPinfo {
|
||||
|
@ -20,3 +102,9 @@ diff -up mp-9fdb5147068f3b719999210e56b493327f1ca5e7/src/asl/solvers/asl.h.orig
|
|||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
</code></pre></td></tr></table>
|
||||
</div> <!-- class=content -->
|
||||
<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2016-03-30 10:58:39 (GMT)</div>
|
||||
</div> <!-- id=cgit -->
|
||||
</body>
|
||||
</html>
|
||||
|
|
16
mp.spec
16
mp.spec
|
@ -1,5 +1,5 @@
|
|||
%global commit 9fdb5147068f3b719999210e56b493327f1ca5e7
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
#%%global commit 9fdb5147068f3b719999210e56b493327f1ca5e7
|
||||
#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7})
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_jacop 1
|
||||
|
@ -14,12 +14,12 @@
|
|||
%endif
|
||||
|
||||
Name: mp
|
||||
Version: 3.0.1
|
||||
Release: 0.2%{?dist}
|
||||
Version: 3.1.0
|
||||
Release: 1%{?dist}
|
||||
License: MIT and BSD
|
||||
Summary: An open-source library for mathematical programming
|
||||
URL: https://github.com/ampl/mp
|
||||
Source0: https://github.com/ampl/mp/archive/%{commit}.zip#/%{name}-%{commit}.zip
|
||||
Source0: https://github.com/ampl/mp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source1: mp.module.in
|
||||
Patch0: mp-strtod.patch
|
||||
Requires: environment(modules)
|
||||
|
@ -84,7 +84,7 @@ This package contains the header files and development documentation
|
|||
for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{commit}
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch0 -p1
|
||||
%if %{with_jacop}
|
||||
ln -s %{_javadir}/jacop/jacop.jar thirdparty/jacop/jacop-`rpm -q --qf "%%{VERSION}" jacop`.jar
|
||||
|
@ -210,6 +210,9 @@ ctest --force-new-ctest-process
|
|||
%{_includedir}/mp
|
||||
|
||||
%changelog
|
||||
* Wed Mar 30 2016 Antonio Trande <sagitter@fedoraproject.org.com> - 3.1.0-1
|
||||
- Update to 3.1.0
|
||||
|
||||
* Wed Mar 16 2016 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 3.0.1-0.2
|
||||
- Avoid incorrect system detection and use of strtod_ASL wrapper
|
||||
- Install extra headers required by coin-or-Couenne
|
||||
|
@ -279,3 +282,4 @@ ctest --force-new-ctest-process
|
|||
|
||||
* Sat Dec 13 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - v20141006-1
|
||||
- Initial mp spec.
|
||||
|
||||
|
|
Loading…
Reference in New Issue