Fixed patches used in the previous build

- Fixes bug #1105767
This commit is contained in:
nonamedotc 2014-06-07 21:55:06 -05:00
parent 3e0ecca6d7
commit 55e43fc8f9
5 changed files with 8 additions and 46 deletions

View File

@ -1,11 +0,0 @@
--- src/cvode/cvode.c 2012-04-11 19:31:13.000000000 -0500
+++ src/cvode/cvode.c.fix 2014-05-21 21:19:55.296755987 -0500
@@ -4136,7 +4136,7 @@
#ifndef NO_FPRINTF_OUTPUT
fprintf(stderr, "\n[%s ERROR] %s\n ", module, fname);
- fprintf(stderr, msgfmt);
+ fprintf("%s", msgfmt);
fprintf(stderr, "\n\n");
#endif

View File

@ -1,11 +0,0 @@
--- src/cvodes/cvodes.c 2012-04-11 19:31:36.000000000 -0500
+++ src/cvodes/cvodes.c.fix 2014-05-21 21:23:10.359954662 -0500
@@ -8958,7 +8958,7 @@
#ifndef NO_FPRINTF_OUTPUT
fprintf(stderr, "\n[%s ERROR] %s\n ", module, fname);
- fprintf(stderr, msg);
+ fprintf("%s", msg);
fprintf(stderr, "\n\n");
#endif

View File

@ -1,11 +0,0 @@
--- src/ida/ida.c 2012-04-11 19:32:13.000000000 -0500
+++ src/ida/ida.c.fix 2014-05-21 21:24:07.269720688 -0500
@@ -3378,7 +3378,7 @@
#ifndef NO_FPRINTF_OUTPUT
fprintf(stderr, "\n[%s ERROR] %s\n ", module, fname);
- fprintf(stderr, msgfmt);
+ fprintf("%s", msgfmt);
fprintf(stderr, "\n\n");
#endif

View File

@ -1,11 +0,0 @@
--- src/idas/idas.c 2012-04-11 19:32:34.000000000 -0500
+++ src/idas/idas.c.fix 2014-05-21 21:24:14.934689168 -0500
@@ -7179,7 +7179,7 @@
#ifndef NO_FPRINTF_OUTPUT
fprintf(stderr, "\n[%s ERROR] %s\n ", module, fname);
- fprintf(stderr, msgfmt);
+ fprintf("%s", msgfmt);
fprintf(stderr, "\n\n");
#endif

View File

@ -1,7 +1,7 @@
Summary: Suite of nonlinear solvers
Name: sundials
Version: 2.5.0
Release: 4%{?dist}
Release: 5%{?dist}
# SUNDIALS is licensed under BSD with some additional (but unrestrictive) clauses.
# Check the file 'LICENSE' for details.
License: BSD
@ -18,6 +18,7 @@ Patch1: %{name}-cvode.patch
Patch2: %{name}-cvodes.patch
Patch3: %{name}-ida.patch
Patch4: %{name}-idas.patch
Patch5: %{name}-kinsol.patch
%ifnarch s390 s390x
BuildRequires: openmpi-devel
@ -73,6 +74,7 @@ This package contains the documentation files
%patch2
%patch3
%patch4
%patch5
%build
%configure \
@ -116,6 +118,10 @@ rm ${RPM_BUILD_ROOT}%{_libdir}/*.la
%{_libdir}/*.a
%changelog
* Sat Jun 07 2014 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 2.5.0-5
- Fixed patches used in the previous build
- Fixes bug #1105767
* Wed May 21 2014 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 2.5.0-4
- added patches to fix bugs #926583 and #1037342
@ -125,7 +131,7 @@ rm ${RPM_BUILD_ROOT}%{_libdir}/*.la
* Mon Feb 18 2013 Dan Horák <dan[at]danny.cz> - 2.5.0-2
- openmpi not available s390(x)
* Sat Jan 26 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 2.5.0-1
* Sun Jan 26 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 2.5.0-1
- upstream release 2.5.0
- enable parallel build
- drop obsolete patch