Hello community, here is the log from the commit of package cfitsio for openSUSE:Factory checked in at 2014-02-19 06:51:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-19 12:07:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cfitsio.new/cfitsio.changes 2014-02-19 06:51:38.000000000 +0100 @@ -1,0 +2,62 @@ +Sun Feb 16 21:46:00 UTC 2014 - [email protected] + +- Update to version 3.360: + * added 9 Dec: small change to the fileseek function in drvrfile.c to + support large files > 2 GB when building CFITSIO with MinGW on Windows + * reorganized the CFITSIO code directory structure; added a 'docs' + subdirectory for all the documentation, and a 'zlib' directory + for the zlib/gzip file compression code. + * made major changes to the compression code for FITS binary table + to support all types of columns, including variable-length arrays. + This code is mainly used via the fpack and funpack programs. + * increased the number of FITS files that can be opened as one + time to 1000, as defined by NMAXFILES in fitsio2.h. + * made small configuration changes to configure.in, configure, + fitsio.h, and drvrfile.c to support large files (64-bit file + offsets} when using the mingw-w64 compiler (provided by + Benjamin Gilbert). + * made small change to fits_delete_file to more completely ignore + any non-zero input status value. + * fixed a logic error in a 'if' test when parsing a keyword name + in the ngp_keyword_is_write function in grparser.c (provided + by David Binderman). + * when specifying the image compression parameters as part of the + compressed image file name (using the "[compress]" qualifier + after the name of the file), the quantization level value, if + specified, was not being recognized by the CFITSIO compression + routines. The image would always be compressed with the default + quantization level of 4.0, regardless of what was specified. This + affected the imcopy program, and potentially other user-generated + application programs that used this method to specify the + compression parameters. This bug did not affect fpack or + funpack. This was fixed in the imcomp_get_compressed_image_par + routine in the imcompress.c file. (reported by Sean Peters) + * defined a new CFITS_API macro in fitsio.h which is used to export the + public symbols when building CFITSIO on Windows systems with CMake. This + works in conjunction with the new Windows CMake build procedure that + is described in the README.win32 file. This complete revamping of the + way CFITSIO is built under Windows now supports building 64-bit + versions of the library. Thanks to Daniel Kaneider (Luminance HDR + Team) for providing these new CMake build procedures. + * modified the way that the low-level file_create routine works when + running in the Hera environment to ensure that the FITS file that is + created is within the allow user data disk area. + * modified fits_get_compression_type so that it does not return an error + if the HDU is a normal FITS IMAGE extension, and is not a tile-compressed + image. + * modified the low-level ffgcl* and ffpcl* routines to ensure that they + never try ro read or write more than 2**31 bytes from disk at one time, + as might happen with very large images, to avoid integer overflow errors. + Fix kindly provided by Fred Gutsche at NanoFocus AG (www.nanofocus.de). + * modified Makefile.in so that doing 'make distclean' does not delete + new config.sub and config.guess files that were recently added. + * adopted a patch from Debian in zcompress.c to "define" the values of + GZBUFSIZE and BUFFINCR, instead of exporting the symbols as 'int's. +- Renamed libcfitsio-devel to cfitsio-devel and libcfitsio-devel-doc to + cfitsio-devel-doc. Added appropriate Provides/Obsoletes entries. +- Removed the following patches (fixed upstream): + * implicit-pointer-decl.patch + * no-return-in-nonvoid-function.patch +- Rebased cfitsio-zlib.patch to apply cleanly. + +------------------------------------------------------------------- Old: ---- cfitsio3350.tar.gz implicit-pointer-decl.patch no-return-in-nonvoid-function.patch New: ---- cfitsio3360.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfitsio.spec ++++++ --- /var/tmp/diff_new_pack.JJ1wcb/_old 2014-02-19 06:51:39.000000000 +0100 +++ /var/tmp/diff_new_pack.JJ1wcb/_new 2014-02-19 06:51:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cfitsio # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,22 @@ # -%define so_ver 1 +%define so_ver 2 Name: cfitsio -Version: 3.350 +Version: 3.360 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/cfitsio3350.tar.gz +Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3360.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) Patch0: cfitsio-zlib.patch -# PATCH-FIX-OPENSUSE implicit-pointer-decl.patch [email protected] -- Fix "implicit-pointer-decl" rpm post build check warning -Patch1: implicit-pointer-decl.patch # PATCH-FIX-OPENSUSE aarch64-support.patch [email protected] -- Add support for aarch64 -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 -Patch4: ppc64le-support.patch +Patch1: aarch64-support.patch +# PATCH-FIX-OPENSUSE ppc64le-support.patch [email protected] -- Add support for ppc64le +Patch2: ppc64le-support.patch BuildRequires: gcc-fortran BuildRequires: pkg-config BuildRequires: zlib-devel @@ -50,50 +47,56 @@ This package contains some FITS image compression and decompression utilities. -%package -n libcfitsio%{so_ver} -Summary: Library for manipulating FITS data files -Group: System/Libraries - -%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 -programmer from the internal complexities of the FITS format. CFITSIO also -provides many advanced features for manipulating and filtering the information -in FITS files. - -%package -n libcfitsio-devel +%package devel Summary: Headers required when building programs against cfitsio library Group: Development/Libraries/Other Requires: libcfitsio%{so_ver} = %{version} Requires: pkg-config -Suggests: libcfitsio-devel-doc = %{version} +Suggests: cfitsio-devel-doc = %{version} +# libcfitsio-devel was last used in openSUSE 13.1 (version 3.350) +Provides: libcfitsio-devel = %{version} +Obsoletes: libcfitsio-devel <= 3.350 -%description -n libcfitsio-devel +%description devel This package contains headers required when building programs against cfitsio library. -%package -n libcfitsio-devel-doc +%package devel-doc Summary: Documentation for the cfitsio library Group: Documentation/Other # libcfitsio-doc was last used in openSUSE 12.1 (version 3.280) Obsoletes: libcfitsio-doc <= 3.280 +# libcfitsio-devel was last used in openSUSE 13.1 (version 3.350) +Provides: libcfitsio-devel-doc = %{version} +Obsoletes: libcfitsio-devel-doc <= 3.350 -%description -n libcfitsio-devel-doc +%description devel-doc This package contains documentation for the cfitsio library. +%package -n libcfitsio%{so_ver} +Summary: Library for manipulating FITS data files +Group: System/Libraries + +%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 +programmer from the internal complexities of the FITS format. CFITSIO also +provides many advanced features for manipulating and filtering the information +in FITS files. + %prep %setup -q -n cfitsio %patch0 -p1 -%patch1 +%patch1 -p1 %patch2 -p1 -%patch3 -%patch4 -p1 # Remove bundled zlib +pushd zlib rm -f adler32.c crc32.c crc32.h deflate.c deflate.h infback.c inffast.c \ inffast.h inffixed.h inflate.c inflate.h inftrees.c inftrees.h trees.c trees.h \ uncompr.c zconf.h zlib.h zutil.c zutil.h +popd %build # lines bellow contain fixes for pkgconfig file bnc#546004, some of them are already fixed by upstream @@ -103,9 +106,6 @@ 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 -export CC=gcc -export FC=f95 -export CFLAGS="%{optflags}" %configure --enable-reentrant make shared %{?_smp_mflags} make fpack %{?_smp_mflags} @@ -113,13 +113,13 @@ %check # testsuite -make testprog +make testprog %{?_smp_mflags} LD_LIBRARY_PATH=. ./testprog > testprog.lis diff testprog.lis testprog.out cmp testprog.fit testprog.std ; echo $? %install -%makeinstall CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} +make DESTDIR=%{buildroot} CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} install mkdir %{buildroot}%{_bindir} install -pm 0755 f{,un}pack %{buildroot}%{_bindir}/ @@ -133,22 +133,22 @@ %files %defattr(-,root,root,-) -%doc License.txt README changes.txt fpackguide.pdf +%doc License.txt README docs/{changes.txt,fpackguide.pdf} %{_bindir}/fpack %{_bindir}/funpack -%files -n libcfitsio%{so_ver} -%defattr(-,root,root,-) -%{_libdir}/libcfitsio.so.%{so_ver}* - -%files -n libcfitsio-devel +%files devel %defattr(-,root,root,-) %{_includedir}/%{name}/ %{_libdir}/libcfitsio.so %{_libdir}/pkgconfig/cfitsio.pc -%files -n libcfitsio-devel-doc +%files devel-doc %defattr(-,root,root,-) -%doc cfitsio.doc cfitsio.ps cfortran.doc fitsio.doc fitsio.ps quick.ps +%doc docs/{cfitsio.doc,cfitsio.ps,cfortran.doc,fitsio.doc,fitsio.ps,quick.ps} + +%files -n libcfitsio%{so_ver} +%defattr(-,root,root,-) +%{_libdir}/libcfitsio.so.%{so_ver}* %changelog ++++++ cfitsio-zlib.patch ++++++ --- /var/tmp/diff_new_pack.JJ1wcb/_old 2014-02-19 06:51:39.000000000 +0100 +++ /var/tmp/diff_new_pack.JJ1wcb/_new 2014-02-19 06:51:39.000000000 +0100 @@ -1,18 +1,18 @@ -diff -Naur cfitsio/Makefile.in cfitsio-zlib/Makefile.in ---- 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 \ +diff -Naur cfitsio.orig/Makefile.in cfitsio/Makefile.in +--- cfitsio.orig/Makefile.in 2013-12-06 00:20:57.000000000 +0200 ++++ cfitsio/Makefile.in 2014-02-16 22:57:32.164992353 +0200 +@@ -62,9 +62,7 @@ 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 - SOURCES = ${CORE_SOURCES} @F77_WRAPPERS@ +-ZLIB_SOURCES = zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \ +- zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \ +- zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c ++ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c -@@ -95,7 +93,7 @@ + SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@ + +@@ -97,7 +95,7 @@ shared: libcfitsio${SHLIB_SUFFIX} libcfitsio${SHLIB_SUFFIX}: ${OBJECTS} @@ -21,7 +21,7 @@ @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ -@@ -116,13 +114,13 @@ +@@ -118,13 +116,13 @@ ${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm testprog: testprog.o libcfitsio.a ${OBJECTS} @@ -38,9 +38,9 @@ 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 2012-09-06 21:50:19.000000000 +0300 -+++ cfitsio-zlib/zcompress.c 2013-07-07 13:54:07.634202021 +0300 +diff -Naur cfitsio.orig/zlib/zcompress.c cfitsio/zlib/zcompress.c +--- cfitsio.orig/zlib/zcompress.c 2013-10-30 22:10:22.000000000 +0200 ++++ cfitsio/zlib/zcompress.c 2014-02-16 22:57:59.157432119 +0200 @@ -2,7 +2,7 @@ #include <errno.h> #include <stdlib.h> @@ -48,5 +48,5 @@ -#include "zlib.h" +#include <zlib.h> - unsigned int GZBUFSIZE = 115200; /* 40 FITS blocks */ - int BUFFINCR = 28800; /* 10 FITS blocks */ + #define GZBUFSIZE 115200 /* 40 FITS blocks */ + #define BUFFINCR 28800 /* 10 FITS blocks */ ++++++ cfitsio3350.tar.gz -> cfitsio3360.tar.gz ++++++ ++++ 180153 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
