[cgnslib/f15/master] Updated to 2.5.5 release.
Shakthi Kannan
shakthimaan at fedoraproject.org
Tue Mar 1 10:31:56 UTC 2011
commit 491118ae47b5aa64ca05fdd001d7812fcfd86339
Author: Shakthi Kannan <shaks at gladiator.(none)>
Date: Tue Mar 1 15:59:04 2011 +0530
Updated to 2.5.5 release.
.gitignore | 1 +
...h => cgnslib-2.5-5-replace-exit-to-return.patch | 98 ++++++++++----------
cgnslib.spec | 10 +-
sources | 2 +-
4 files changed, 57 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f282747..35c960c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
cgnslib_2.5-4.tar.gz
usersguide.pdf
+/cgnslib_2.5-5.tar.gz
diff --git a/cgnslib-2.5-4-replace-exit-to-return.patch b/cgnslib-2.5-5-replace-exit-to-return.patch
similarity index 90%
rename from cgnslib-2.5-4-replace-exit-to-return.patch
rename to cgnslib-2.5-5-replace-exit-to-return.patch
index 7b4dd87..a4a9e05 100644
--- a/cgnslib-2.5-4-replace-exit-to-return.patch
+++ b/cgnslib-2.5-5-replace-exit-to-return.patch
@@ -1,6 +1,6 @@
diff -up cgnslib_2.5/adf_cond.c.exit cgnslib_2.5/adf_cond.c
---- cgnslib_2.5/adf_cond.c.exit 2007-01-01 05:23:14.000000000 +0530
-+++ cgnslib_2.5/adf_cond.c 2010-07-16 14:53:41.396262791 +0530
+--- cgnslib_2.5/adf_cond.c.exit 2011-02-27 12:07:23.715838333 +0530
++++ cgnslib_2.5/adf_cond.c 2011-02-27 12:08:06.693837993 +0530
@@ -383,7 +383,7 @@ static void ErrorExit( char *ermsg, int
ADF_Error_Message(ErrStat,input) ;
fprintf(stderr,"%s\n",input) ;
@@ -11,11 +11,11 @@ diff -up cgnslib_2.5/adf_cond.c.exit cgnslib_2.5/adf_cond.c
#if defined (__cplusplus)
diff -up cgnslib_2.5/adfh/adf2hdf.c.exit cgnslib_2.5/adfh/adf2hdf.c
---- cgnslib_2.5/adfh/adf2hdf.c.exit 2006-10-03 04:36:46.000000000 +0530
-+++ cgnslib_2.5/adfh/adf2hdf.c 2010-07-16 14:53:41.396262791 +0530
+--- cgnslib_2.5/adfh/adf2hdf.c.exit 2011-02-27 12:08:29.448837989 +0530
++++ cgnslib_2.5/adfh/adf2hdf.c 2011-02-27 12:09:33.466838263 +0530
@@ -57,7 +57,7 @@ static int is_ADF_file(char *fname) {
- if ((fp = fopen(fname, "r+b")) == NULL) {
+ if ((fp = fopen(fname, "rb")) == NULL) {
fprintf(stderr, "couldn't open %s for reading\n", fname);
- exit (1);
+ return 1;
@@ -74,8 +74,8 @@ diff -up cgnslib_2.5/adfh/adf2hdf.c.exit cgnslib_2.5/adfh/adf2hdf.c
printf ("ADF file size = %ld bytes\n", (long)inpst.st_size);
diff -up cgnslib_2.5/adfh/ADFH.c.exit cgnslib_2.5/adfh/ADFH.c
---- cgnslib_2.5/adfh/ADFH.c.exit 2009-09-01 03:26:39.000000000 +0530
-+++ cgnslib_2.5/adfh/ADFH.c 2010-07-16 14:53:41.398276550 +0530
+--- cgnslib_2.5/adfh/ADFH.c.exit 2011-02-27 12:10:18.980838002 +0530
++++ cgnslib_2.5/adfh/ADFH.c 2011-02-27 12:10:31.599837848 +0530
@@ -254,7 +254,7 @@ static void set_error(int errcode, int *
char errmsg[ADF_MAX_ERROR_STR_LENGTH+1];
ADFH_Error_Message(errcode, errmsg);
@@ -86,8 +86,8 @@ diff -up cgnslib_2.5/adfh/ADFH.c.exit cgnslib_2.5/adfh/ADFH.c
*err = errcode;
}
diff -up cgnslib_2.5/adfh/hdf2adf.c.exit cgnslib_2.5/adfh/hdf2adf.c
---- cgnslib_2.5/adfh/hdf2adf.c.exit 2006-10-03 04:36:47.000000000 +0530
-+++ cgnslib_2.5/adfh/hdf2adf.c 2010-07-16 14:53:41.398276550 +0530
+--- cgnslib_2.5/adfh/hdf2adf.c.exit 2011-02-27 12:10:50.686838060 +0530
++++ cgnslib_2.5/adfh/hdf2adf.c 2011-02-27 12:11:36.300837824 +0530
@@ -59,7 +59,7 @@ static void ErrorExit()
ADF_Database_Close (OutputRootID, &ErrStat);
if (TempFile[0])
@@ -140,8 +140,8 @@ diff -up cgnslib_2.5/adfh/hdf2adf.c.exit cgnslib_2.5/adfh/hdf2adf.c
printf ("HDF5 file size = %ld bytes\n", (long)inpst.st_size);
diff -up cgnslib_2.5/cgns_error.c.exit cgnslib_2.5/cgns_error.c
---- cgnslib_2.5/cgns_error.c.exit 2007-01-01 05:23:14.000000000 +0530
-+++ cgnslib_2.5/cgns_error.c 2010-07-16 14:53:41.398276550 +0530
+--- cgnslib_2.5/cgns_error.c.exit 2011-02-27 12:11:58.917837916 +0530
++++ cgnslib_2.5/cgns_error.c 2011-02-27 12:12:11.536837970 +0530
@@ -63,7 +63,7 @@ CGNSDLL void cg_error_exit() {
(*cgns_error_handler)(-1, cgns_error_mess);
else
@@ -152,8 +152,8 @@ diff -up cgnslib_2.5/cgns_error.c.exit cgnslib_2.5/cgns_error.c
CGNSDLL void cg_error_print() {
diff -up cgnslib_2.5/cgns_internals.c.exit cgnslib_2.5/cgns_internals.c
---- cgnslib_2.5/cgns_internals.c.exit 2010-07-16 14:54:46.609260208 +0530
-+++ cgnslib_2.5/cgns_internals.c 2010-07-16 14:55:05.733261395 +0530
+--- cgnslib_2.5/cgns_internals.c.exit 2011-02-27 12:12:31.017837953 +0530
++++ cgnslib_2.5/cgns_internals.c 2011-02-27 12:12:46.601837676 +0530
@@ -87,7 +87,7 @@ void *cgi_malloc(int cnt, int size) {
void *buf = calloc(cnt, size);
if (buf == NULL) {
@@ -173,8 +173,8 @@ diff -up cgnslib_2.5/cgns_internals.c.exit cgnslib_2.5/cgns_internals.c
return buf;
}
diff -up cgnslib_2.5/tests/adflist.c.exit cgnslib_2.5/tests/adflist.c
---- cgnslib_2.5/tests/adflist.c.exit 2007-01-01 05:23:15.000000000 +0530
-+++ cgnslib_2.5/tests/adflist.c 2010-07-16 14:53:41.399276760 +0530
+--- cgnslib_2.5/tests/adflist.c.exit 2011-02-27 12:13:13.669838000 +0530
++++ cgnslib_2.5/tests/adflist.c 2011-02-27 12:13:55.925837996 +0530
@@ -35,7 +35,7 @@ static void err_exit (char *name, int er
fflush (stdout);
ADF_Error_Message (errcode, errmsg);
@@ -202,17 +202,18 @@ diff -up cgnslib_2.5/tests/adflist.c.exit cgnslib_2.5/tests/adflist.c
}
break;
case 'f':
-@@ -230,7 +230,6 @@ int main (int argc, char *argv[])
+@@ -230,7 +230,7 @@ int main (int argc, char *argv[])
ADF_Database_Close (root_id, &err);
if (err > 0)
err_exit ("ADF_Database_Close", err);
- exit (0);
++
return 0; /* prevent compiler warning */
}
diff -up cgnslib_2.5/tests/dbtest.c.exit cgnslib_2.5/tests/dbtest.c
---- cgnslib_2.5/tests/dbtest.c.exit 2010-07-16 14:53:53.526385225 +0530
-+++ cgnslib_2.5/tests/dbtest.c 2010-07-16 14:54:20.292261257 +0530
+--- cgnslib_2.5/tests/dbtest.c.exit 2011-02-27 12:14:14.159838006 +0530
++++ cgnslib_2.5/tests/dbtest.c 2011-02-27 12:14:33.517837953 +0530
@@ -30,7 +30,7 @@ int main (int argc, char **argv)
if (argc < 3 || argc > 4) {
@@ -232,8 +233,8 @@ diff -up cgnslib_2.5/tests/dbtest.c.exit cgnslib_2.5/tests/dbtest.c
for (i = 0; i < numvalues; i++)
values[i] = (float)i;
diff -up cgnslib_2.5/tests/getargs.c.exit cgnslib_2.5/tests/getargs.c
---- cgnslib_2.5/tests/getargs.c.exit 2006-10-03 04:36:47.000000000 +0530
-+++ cgnslib_2.5/tests/getargs.c 2010-07-16 14:53:41.399276760 +0530
+--- cgnslib_2.5/tests/getargs.c.exit 2011-02-27 12:15:43.827838065 +0530
++++ cgnslib_2.5/tests/getargs.c 2011-02-27 12:16:13.621838359 +0530
@@ -22,7 +22,7 @@ char **usgmsg, *errmsg;
fprintf (stderr, "ERROR: %s\n", errmsg);
for (n = 0; NULL != usgmsg[n]; n++)
@@ -262,8 +263,8 @@ diff -up cgnslib_2.5/tests/getargs.c.exit cgnslib_2.5/tests/getargs.c
place = argv[argind];
}
diff -up cgnslib_2.5/tests/open_cgns.c.exit cgnslib_2.5/tests/open_cgns.c
---- cgnslib_2.5/tests/open_cgns.c.exit 2008-01-19 09:15:16.000000000 +0530
-+++ cgnslib_2.5/tests/open_cgns.c 2010-07-16 14:53:41.399276760 +0530
+--- cgnslib_2.5/tests/open_cgns.c.exit 2011-02-27 12:16:34.752838017 +0530
++++ cgnslib_2.5/tests/open_cgns.c 2011-02-27 12:16:44.360837993 +0530
@@ -9,7 +9,7 @@ int main (int argc, char **argv)
if (argc < 2 || argc > 3) {
@@ -274,14 +275,14 @@ diff -up cgnslib_2.5/tests/open_cgns.c.exit cgnslib_2.5/tests/open_cgns.c
if (argc > 2) {
mode = CG_MODE_MODIFY;
diff -up cgnslib_2.5/tests/test_exts.c.exit cgnslib_2.5/tests/test_exts.c
---- cgnslib_2.5/tests/test_exts.c.exit 2008-01-19 09:15:16.000000000 +0530
-+++ cgnslib_2.5/tests/test_exts.c 2010-07-16 14:53:41.400276410 +0530
+--- cgnslib_2.5/tests/test_exts.c.exit 2011-02-27 12:17:01.206837984 +0530
++++ cgnslib_2.5/tests/test_exts.c 2011-02-27 12:17:54.612838570 +0530
@@ -10,12 +10,12 @@
float coord[NUM_SIDE*NUM_SIDE*NUM_SIDE];
-#define CHECK(L,B) if(!(B)){fprintf(stderr,"mismatch in %s\n",L);exit(1);}
-+#define CHECK(L,B) if(!(B)){fprintf(stderr,"mismatch in %s\n",L); return 1;}
++#define CHECK(L,B) if(!(B)){fprintf(stderr,"mismatch in %s\n",L);return 1;}
void error_exit (char *where)
{
@@ -292,14 +293,14 @@ diff -up cgnslib_2.5/tests/test_exts.c.exit cgnslib_2.5/tests/test_exts.c
int main (int argc, char **argv)
diff -up cgnslib_2.5/tests/test_goto.c.exit cgnslib_2.5/tests/test_goto.c
---- cgnslib_2.5/tests/test_goto.c.exit 2008-01-19 09:15:16.000000000 +0530
-+++ cgnslib_2.5/tests/test_goto.c 2010-07-16 14:53:41.400276410 +0530
+--- cgnslib_2.5/tests/test_goto.c.exit 2011-02-27 12:18:09.398837889 +0530
++++ cgnslib_2.5/tests/test_goto.c 2011-02-27 12:18:26.502838016 +0530
@@ -10,13 +10,13 @@
float coord[NUM_SIDE*NUM_SIDE*NUM_SIDE];
-#define CHECK(L,B) if(!(B)){fprintf(stderr,"mismatch in %s\n",L);exit(1);}
-+#define CHECK(L,B) if(!(B)){fprintf(stderr,"mismatch in %s\n",L); return 1;}
++#define CHECK(L,B) if(!(B)){fprintf(stderr,"mismatch in %s\n",L);return 1;}
void error_exit (int iserr, char *msg)
{
@@ -311,8 +312,8 @@ diff -up cgnslib_2.5/tests/test_goto.c.exit cgnslib_2.5/tests/test_goto.c
else
printf ("WARNING:%s\n", msg);
diff -up cgnslib_2.5/tests/write_array.c.exit cgnslib_2.5/tests/write_array.c
---- cgnslib_2.5/tests/write_array.c.exit 2008-01-19 09:15:16.000000000 +0530
-+++ cgnslib_2.5/tests/write_array.c 2010-07-16 14:53:41.401276620 +0530
+--- cgnslib_2.5/tests/write_array.c.exit 2011-02-27 12:18:54.147838008 +0530
++++ cgnslib_2.5/tests/write_array.c 2011-02-27 12:19:04.971837897 +0530
@@ -24,7 +24,7 @@ int main (int argc, char **argv)
array = (float *) malloc (arraysize * sizeof(float));
if (NULL == array) {
@@ -323,8 +324,8 @@ diff -up cgnslib_2.5/tests/write_array.c.exit cgnslib_2.5/tests/write_array.c
for (na = 0; na < arraysize; na++)
array[na] = (float)na;
diff -up cgnslib_2.5/tests/write_rind.c.exit cgnslib_2.5/tests/write_rind.c
---- cgnslib_2.5/tests/write_rind.c.exit 2008-01-19 09:15:16.000000000 +0530
-+++ cgnslib_2.5/tests/write_rind.c 2010-07-16 14:53:41.401276620 +0530
+--- cgnslib_2.5/tests/write_rind.c.exit 2011-02-27 12:19:22.165838102 +0530
++++ cgnslib_2.5/tests/write_rind.c 2011-02-27 12:19:31.710838097 +0530
@@ -59,7 +59,7 @@ int main ()
nmap = (int *) malloc((num_coord + 8 * num_element) * sizeof(int));
if (NULL == xcoord || NULL == nmap) {
@@ -335,8 +336,8 @@ diff -up cgnslib_2.5/tests/write_rind.c.exit cgnslib_2.5/tests/write_rind.c
ycoord = xcoord + num_coord;
zcoord = ycoord + num_coord;
diff -up cgnslib_2.5/tests/write_test.c.exit cgnslib_2.5/tests/write_test.c
---- cgnslib_2.5/tests/write_test.c.exit 2007-01-01 05:23:15.000000000 +0530
-+++ cgnslib_2.5/tests/write_test.c 2010-07-16 14:53:41.405259439 +0530
+--- cgnslib_2.5/tests/write_test.c.exit 2011-02-27 12:19:51.497837996 +0530
++++ cgnslib_2.5/tests/write_test.c 2011-02-27 12:21:17.861838016 +0530
@@ -57,7 +57,7 @@ void write_mixed(), write_mismatched();
void error_exit (char *where)
{
@@ -401,8 +402,8 @@ diff -up cgnslib_2.5/tests/write_test.c.exit cgnslib_2.5/tests/write_test.c
}
diff -up cgnslib_2.5/tools/cgnscheck.c.exit cgnslib_2.5/tools/cgnscheck.c
---- cgnslib_2.5/tools/cgnscheck.c.exit 2008-07-10 08:03:57.000000000 +0530
-+++ cgnslib_2.5/tools/cgnscheck.c 2010-07-16 14:53:41.410258740 +0530
+--- cgnslib_2.5/tools/cgnscheck.c.exit 2011-02-27 12:21:37.497838028 +0530
++++ cgnslib_2.5/tools/cgnscheck.c 2011-02-27 12:26:46.501837845 +0530
@@ -157,7 +157,7 @@ static void error_exit(char *func)
if (func != NULL && *func)
printf("%s:", func);
@@ -620,7 +621,7 @@ diff -up cgnslib_2.5/tools/cgnscheck.c.exit cgnslib_2.5/tools/cgnscheck.c
if (icnt == NULL) {
fprintf (stderr, "malloc failed for number of families\n");
- exit (1);
-+ return 1;
++ return (1);
}
if (cg_array_read (nnf, icnt)) error_exit("cg_array_read");
for (ns = 0; ns < NumSteps; ns++) {
@@ -670,8 +671,8 @@ diff -up cgnslib_2.5/tools/cgnscheck.c.exit cgnslib_2.5/tools/cgnscheck.c
printf ("reading CGNS file %s\n", cgnsfile);
diff -up cgnslib_2.5/tools/cgnsdiff.c.exit cgnslib_2.5/tools/cgnsdiff.c
---- cgnslib_2.5/tools/cgnsdiff.c.exit 2008-01-19 09:15:16.000000000 +0530
-+++ cgnslib_2.5/tools/cgnsdiff.c 2010-07-16 14:53:41.411259439 +0530
+--- cgnslib_2.5/tools/cgnsdiff.c.exit 2011-02-27 12:27:28.312837991 +0530
++++ cgnslib_2.5/tools/cgnsdiff.c 2011-02-27 12:28:18.609838002 +0530
@@ -50,7 +50,7 @@ static void err_exit (char *msg, char *n
fprintf (stderr, "%s:", name);
fprintf (stderr, "%s\n", errmsg);
@@ -715,8 +716,8 @@ diff -up cgnslib_2.5/tools/cgnsdiff.c.exit cgnslib_2.5/tools/cgnsdiff.c
ADF_Children_Names (id2, 1, nc2, 32, &nret, children2, &err);
if (err > 0)
diff -up cgnslib_2.5/tools/cgnslist.c.exit cgnslib_2.5/tools/cgnslist.c
---- cgnslib_2.5/tools/cgnslist.c.exit 2010-07-16 14:56:54.232285562 +0530
-+++ cgnslib_2.5/tools/cgnslist.c 2010-07-16 14:57:30.726261263 +0530
+--- cgnslib_2.5/tools/cgnslist.c.exit 2011-02-27 12:28:36.637838000 +0530
++++ cgnslib_2.5/tools/cgnslist.c 2011-02-27 12:29:10.814837992 +0530
@@ -35,7 +35,7 @@ static void err_exit (char *name, int er
fflush (stdout);
ADF_Error_Message (errcode, errmsg);
@@ -744,17 +745,18 @@ diff -up cgnslib_2.5/tools/cgnslist.c.exit cgnslib_2.5/tools/cgnslist.c
}
break;
case 'f':
-@@ -240,7 +240,6 @@ int main (int argc, char *argv[])
+@@ -240,7 +240,7 @@ int main (int argc, char *argv[])
ADF_Database_Close (root_id, &err);
if (err > 0)
err_exit ("ADF_Database_Close", err);
- exit (0);
++
return 0; /* prevent compiler warning */
}
diff -up cgnslib_2.5/tools/cgnspack.c.exit cgnslib_2.5/tools/cgnspack.c
---- cgnslib_2.5/tools/cgnspack.c.exit 2010-07-16 14:55:32.576385225 +0530
-+++ cgnslib_2.5/tools/cgnspack.c 2010-07-16 14:56:30.021261676 +0530
+--- cgnslib_2.5/tools/cgnspack.c.exit 2011-02-27 12:29:37.108838039 +0530
++++ cgnslib_2.5/tools/cgnspack.c 2011-02-27 12:30:25.830837897 +0530
@@ -24,12 +24,12 @@ int main (int argc, char **argv)
if (argc < 2 || argc > 3) {
@@ -822,8 +824,8 @@ diff -up cgnslib_2.5/tools/cgnspack.c.exit cgnslib_2.5/tools/cgnspack.c
printf ("initial size = %ld bytes\n", (long)inpst.st_size);
diff -up cgnslib_2.5/tools/cgnsversion.c.exit cgnslib_2.5/tools/cgnsversion.c
---- cgnslib_2.5/tools/cgnsversion.c.exit 2008-01-19 09:15:16.000000000 +0530
-+++ cgnslib_2.5/tools/cgnsversion.c 2010-07-16 14:53:41.412259997 +0530
+--- cgnslib_2.5/tools/cgnsversion.c.exit 2011-02-27 12:30:43.097837993 +0530
++++ cgnslib_2.5/tools/cgnsversion.c 2011-02-27 12:32:01.200838305 +0530
@@ -100,7 +100,7 @@ static void error_exit (char *msg, int e
if (inproot >= 0.0) ADF_Database_Close (inproot, &ierr);
if (outroot >= 0.0) ADF_Database_Close (outroot, &ierr);
@@ -893,8 +895,8 @@ diff -up cgnslib_2.5/tools/cgnsversion.c.exit cgnslib_2.5/tools/cgnsversion.c
return 0;
diff -up cgnslib_2.5/tools/getargs.c.exit cgnslib_2.5/tools/getargs.c
---- cgnslib_2.5/tools/getargs.c.exit 2007-01-01 05:12:35.000000000 +0530
-+++ cgnslib_2.5/tools/getargs.c 2010-07-16 14:53:41.412259997 +0530
+--- cgnslib_2.5/tools/getargs.c.exit 2011-02-27 12:32:19.764837995 +0530
++++ cgnslib_2.5/tools/getargs.c 2011-02-27 12:32:41.894837916 +0530
@@ -22,7 +22,7 @@ char **usgmsg, *errmsg;
fprintf (stderr, "ERROR: %s\n", errmsg);
for (n = 0; NULL != usgmsg[n]; n++)
diff --git a/cgnslib.spec b/cgnslib.spec
index 57f92c2..da95b18 100644
--- a/cgnslib.spec
+++ b/cgnslib.spec
@@ -3,17 +3,17 @@
Name: cgnslib
Version: 2.5
-Release: 4.r4%{?dist}
+Release: 5.r1%{?dist}
Summary: Computational Fluid Dynamics General Notation System
Group: Development/Libraries
License: zlib
URL: http://www.cgns.org/
-Source: http://downloads.sourceforge.net/project/cgns/%{name}_%{version}/Release%204/%{name}_%{version}-4.tar.gz
+Source: http://downloads.sourceforge.net/project/cgns/%{name}_%{version}/Release%204/%{name}_%{version}-5.tar.gz
Source1: http://www.grc.nasa.gov/WWW/cgns/user/usersguide.pdf
Patch0: cgnslib-2.5-4-set-so.patch
-Patch1: cgnslib-2.5-4-replace-exit-to-return.patch
+Patch1: cgnslib-2.5-5-replace-exit-to-return.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -112,8 +112,8 @@ cd tests
%{_libdir}/libcgns.so
%changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-4.r4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Thu Feb 17 2011 Shakthi Kannan <shakthimaan [AT] fedoraproject DOT org> 2.5-5.r1
+- Updated to 2.5-5 release.
* Sun Jul 18 2010 Shakthi Kannan <shakthimaan [AT] fedoraproject DOT org> 2.5-3.r4
- Use zlib license that supercedes LGPLv2.
diff --git a/sources b/sources
index 21fb729..723798e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-42063efdf726c81300a51c3495d3224e cgnslib_2.5-4.tar.gz
+ae2a2e79b99d41c63e5ed5f661f70fd9 cgnslib_2.5-5.tar.gz
453788d1d9f7f383f76fde08c022a9a6 usersguide.pdf
More information about the scm-commits
mailing list