Hello community, here is the log from the commit of package cfitsio for openSUSE:Factory checked in at 2013-07-07 22:17:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfitsio (Old) and /work/SRC/openSUSE:Factory/.cfitsio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cfitsio" Changes: -------- --- /work/SRC/openSUSE:Factory/cfitsio/cfitsio.changes 2013-06-17 10:02:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cfitsio.new/cfitsio.changes 2013-07-07 22:17:10.000000000 +0200 @@ -1,0 +2,81 @@ +Sun Jul 7 11:36:05 UTC 2013 - [email protected] + +- Update to version 3.350: + * fixed problem with the default tile size when compressing images with + fpack using the Hcompress algorithm. + * fixed returned value ("status" instead of "*status") + * in imcompress.c, declared some arrays that are used to store the dimensions + of the image from 'int' to 'long', to support very large images (at least + on systems where sizeof(long) = 8), + * modified the routines that convert a string value to a float or double + to prevent them from returning a NaN or Inf value if the + string is "NaN" or "Inf" (as can happen with gcc implementation of the + strtod function). + * removed/replaced the use of the assert() functions when locking or + unlocking threads because they did not work correctly if NDEBUG is + defined. + * made modifications to the way the command-line file filters are parsed to + 1) remove the 1024-character limit when specifying a column filter, + 2) fixed a potential character buffer-overflow risk in fits_get_token, and + 3) improved the parsing logic to remove any possible of confusing + 2 slash characters ("//") in the string as the beginning of a + comment string. + * modified configure and Makefile.in so that when building CFITSIO + as a shared library on linux or Mac platforms, it will use the SONAME + convention to indicate whether each new release of the CFITSIO + library is binary-compatible with the previous version. Application + programs that link with the shared library will not need to be + recompiled as long as the versions are compatible. In practice, + this means that the shared library binary file that is created (on + Linux systems) will have a name like 'libcfitsio.so.I.J.K', where I is the + SONAME version number, J is the major CFITSIO version number (e.g. 3), + and K is the minor CFITSIO version number (e.g., 34). Two link + files will also be created such that + libcfitsio.so -> libcfitsio.so.I, and + libcfitsio.so.I -> libcfitsio.I.J.K + Application programs will still run correctly with the new version of + CFITSIO as long as the 'I' version number remains the same, but the + applications will fail to run if the 'I' number changes, thus alerting + the user that the application must be rebuilt. + * fixed bug in fits_insert_col when computing the new table row width + when inserting a '1Q' variable length array column. + * modified the image compression routines so that the output compressed + image (stored in a FITS binary table) uses the '1Q' variable length + array format (instead of '1P') when the input file is larger than 4 GB. + * added support for "compression directive" keywords which indicate how + that HDU should be compressed (e.g., which compression algorithm to use, + what tiling pattern to use, etc.). The values of these keywords will + override the compression parameters that were specified on the command + line when running the fpack FITS file compression program. + * globally changed the variable and/or subroutine name "dither_offset" + to "dither_seed" and "quantize_dither" to "quantize_method" so + that the names more accurately reflects their purpose. + * added support for a new SUBTRACTIVE_DITHER_2 method when compressing + floating point images. The only difference with the previous method + is that pixels with a value exactly equal to 0.0 will not be dithered, + and instead will be exactly preserved when the image is compressed. + * added support for an alias of "RICE_ONE" for "RICE_1" as the value + of the ZCMPTYPE keyword, which gives the name of the image compression + algorithm. This alias is used if the new SUBTRACTIVE_DITHER_2 option + is used, to prevent old versions of funpack from creating a corrupted + uncompressed image file. Only newer versions of funpack will recognize + this alias and be able to uncompress the image. + * made performance improvement to fits_read_compressed_img so that + when reading a section of an compressed image that includes only + every nth pixel in some dimension, it will only uncompressed a tile + if there are actually any pixels of interest in that tile. + * fixed several issues with the beta FITS binary table compression code + that is used by fpack: added support for zero-length vector columns, + made improvements to the output report when using the -T option in fpack, + changed the default table compression method to 'Rice' instead of + 'Best', and now writes the 'ZTILELEN' keyword to document the number + of table rows in each tile. + * fixed error in ffbinit in calculating the total length of the binary + table extension if the THEAP keyword was used to override the + default starting location of the heap. +- Removed cfitsio.patch (fixed upstream). +- Rebased cfitsio-zlib.patch to apply cleanly. +- Added a patch (no-return-in-nonvoid-function.patch) to fix "Program returns + random data in a function" rpm post build check error. + +------------------------------------------------------------------- Old: ---- cfitsio.patch cfitsio3340.tar.gz New: ---- cfitsio3350.tar.gz no-return-in-nonvoid-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfitsio.spec ++++++ --- /var/tmp/diff_new_pack.d9uwSe/_old 2013-07-07 22:17:12.000000000 +0200 +++ /var/tmp/diff_new_pack.d9uwSe/_new 2013-07-07 22:17:12.000000000 +0200 @@ -16,22 +16,24 @@ # +%define so_ver 1 + Name: cfitsio -Version: 3.340 +Version: 3.350 Release: 0 Summary: Library for manipulating FITS data files License: ISC Group: Productivity/Scientific/Other Url: http://heasarc.nasa.gov/fitsio/ -Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3340.tar.gz -# PATCH-FIX-OPENSUSE cfitsio.patch [email protected] -- Fix library soname (taken from Fedora) -Patch0: cfitsio.patch +Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3350.tar.gz # PATCH-FIX-OPENSUSE cfitsio-zlib.patch [email protected] -- Use system zlib, link programs to shared libcfitsio (based on patches from Fedora and Debian) -Patch1: cfitsio-zlib.patch +Patch0: cfitsio-zlib.patch # PATCH-FIX-OPENSUSE implicit-pointer-decl.patch [email protected] -- Fix "implicit-pointer-decl" rpm post build check warning -Patch2: implicit-pointer-decl.patch +Patch1: implicit-pointer-decl.patch # PATCH-FIX-OPENSUSE aarch64-support.patch [email protected] -- Add support for aarch64 -Patch3: aarch64-support.patch +Patch2: aarch64-support.patch +# PATCH-FIX-OPENSUSE no-return-in-nonvoid-function.patch [email protected] -- Fix "Program returns random data in a function" rpm post build check error +Patch3: no-return-in-nonvoid-function.patch BuildRequires: gcc-fortran BuildRequires: pkg-config BuildRequires: zlib-devel @@ -47,11 +49,11 @@ This package contains some FITS image compression and decompression utilities. -%package -n libcfitsio0 +%package -n libcfitsio%{so_ver} Summary: Library for manipulating FITS data files Group: System/Libraries -%description -n libcfitsio0 +%description -n libcfitsio%{so_ver} CFITSIO is a library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format. CFITSIO provides simple high-level routines for reading and writing FITS files that insulate the @@ -62,7 +64,7 @@ %package -n libcfitsio-devel Summary: Headers required when building programs against cfitsio library Group: Development/Libraries/Other -Requires: libcfitsio0 = %{version} +Requires: libcfitsio%{so_ver} = %{version} Requires: pkg-config Suggests: libcfitsio-devel-doc = %{version} @@ -82,9 +84,9 @@ %prep %setup -q -n cfitsio %patch0 -p1 -%patch1 -p1 -%patch2 -%patch3 -p1 +%patch1 +%patch2 -p1 +%patch3 # Remove bundled zlib rm -f adler32.c crc32.c crc32.h deflate.c deflate.h infback.c inffast.c \ @@ -98,41 +100,34 @@ sed -i 's|Cflags: -I${includedir}|Cflags: -D_REENTRANT -I${includedir} -I${includedir}/%{name}|' cfitsio.pc.in sed -i 's|Libs: -L${libdir} -lcfitsio @LIBS@|Libs: -L${libdir} -lcfitsio|' cfitsio.pc.in sed -i 's|Libs.private: -lm|Libs.private: @LIBS@ -lz -lm|' cfitsio.pc.in -# Fix version -sed -i 's|3.31|3.310|' cfitsio.pc.in export CC=gcc export FC=f95 export CFLAGS="%{optflags}" %configure --enable-reentrant make shared %{?_smp_mflags} -ln -s libcfitsio.so.0 libcfitsio.so make fpack %{?_smp_mflags} make funpack %{?_smp_mflags} %check # testsuite make testprog -./testprog > testprog.lis +LD_LIBRARY_PATH=. ./testprog > testprog.lis diff testprog.lis testprog.out cmp testprog.fit testprog.std ; echo $? %install %makeinstall CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} -pushd %{buildroot}%{_libdir} -ln -s libcfitsio.so.0 libcfitsio.so -popd - mkdir %{buildroot}%{_bindir} install -pm 0755 f{,un}pack %{buildroot}%{_bindir}/ # Remove static libraries rm -f %{buildroot}%{_libdir}/libcfitsio.a -%post -n libcfitsio0 -p /sbin/ldconfig +%post -n libcfitsio%{so_ver} -p /sbin/ldconfig -%postun -n libcfitsio0 -p /sbin/ldconfig +%postun -n libcfitsio%{so_ver} -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -140,9 +135,9 @@ %{_bindir}/fpack %{_bindir}/funpack -%files -n libcfitsio0 +%files -n libcfitsio%{so_ver} %defattr(-,root,root,-) -%{_libdir}/libcfitsio.so.0* +%{_libdir}/libcfitsio.so.%{so_ver}* %files -n libcfitsio-devel %defattr(-,root,root,-) ++++++ cfitsio-zlib.patch ++++++ --- /var/tmp/diff_new_pack.d9uwSe/_old 2013-07-07 22:17:12.000000000 +0200 +++ /var/tmp/diff_new_pack.d9uwSe/_new 2013-07-07 22:17:12.000000000 +0200 @@ -1,27 +1,27 @@ diff -Naur cfitsio/Makefile.in cfitsio-zlib/Makefile.in ---- cfitsio/Makefile.in 2012-07-17 23:38:34.000000000 +0300 -+++ cfitsio-zlib/Makefile.in 2012-07-31 18:40:04.455338700 +0300 -@@ -52,9 +52,7 @@ +--- cfitsio/Makefile.in 2013-04-08 21:11:42.000000000 +0300 ++++ cfitsio-zlib/Makefile.in 2013-07-07 13:53:49.089944333 +0300 +@@ -60,9 +60,7 @@ putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \ putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \ swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \ - pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c \ - adler32.c crc32.c inffast.c inftrees.c trees.c zutil.c \ - deflate.c infback.c inflate.c uncompr.c \ -+ pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c ++ pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c SOURCES = ${CORE_SOURCES} @F77_WRAPPERS@ -@@ -87,7 +85,7 @@ +@@ -95,7 +93,7 @@ shared: libcfitsio${SHLIB_SUFFIX} libcfitsio${SHLIB_SUFFIX}: ${OBJECTS} -- ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm ${LIBS} -+ ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm ${LIBS} -lz - - install: libcfitsio.a $(INSTALL_DIRS) - @if [ -f libcfitsio.a ]; then \ -@@ -109,13 +107,13 @@ +- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS} ++ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS} -lz + @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ + ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ + ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ +@@ -116,13 +114,13 @@ ${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm testprog: testprog.o libcfitsio.a ${OBJECTS} @@ -39,8 +39,8 @@ fitscopy: fitscopy.o libcfitsio.a ${OBJECTS} ${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS} diff -Naur cfitsio/zcompress.c cfitsio-zlib/zcompress.c ---- cfitsio/zcompress.c 2011-01-03 23:17:38.000000000 +0200 -+++ cfitsio-zlib/zcompress.c 2012-07-31 18:23:13.819473443 +0300 +--- cfitsio/zcompress.c 2012-09-06 21:50:19.000000000 +0300 ++++ cfitsio-zlib/zcompress.c 2013-07-07 13:54:07.634202021 +0300 @@ -2,7 +2,7 @@ #include <errno.h> #include <stdlib.h> ++++++ cfitsio3340.tar.gz -> cfitsio3350.tar.gz ++++++ ++++ 17991 lines of diff (skipped) ++++++ no-return-in-nonvoid-function.patch ++++++ --- imcompress.c.orig 2013-07-03 00:38:02.000000000 +0300 +++ imcompress.c 2013-07-07 14:19:36.104169825 +0300 @@ -560,6 +560,7 @@ (fptr->Fptr)->tilesize[ii] = 0; } + return(*status); } /*--------------------------------------------------------------------------*/ int fits_unset_compression_request( @@ -581,6 +582,7 @@ (fptr->Fptr)->request_tilesize[ii] = 0; } + return(*status); } /*--------------------------------------------------------------------------*/ int fits_set_compression_pref( -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
