rpms
/
cfitsio
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 3.470

Browse Source 
Patch to revert bogus soname increase
Patch to fix fprintf format errors
epel9
Sergio Pascual 5 years ago
parent 65eb1ee357
commit 69e798645d
7 changed files with 105 additions and 21 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -12,3 +12,4 @@ cfitsio3250.tar.gz
/cfitsio3420.tar.gz /cfitsio3420.tar.gz
/cfitsio3430.tar.gz /cfitsio3430.tar.gz
/cfitsio3450.tar.gz /cfitsio3450.tar.gz
/cfitsio-3.47.tar.gz

36
cfitsio-3.47-soname.patch
Unescape View File

@ -0,0 +1,36 @@
diff -ur cfitsio-3.47/configure cfitsio-3.47.soname/configure
--- cfitsio-3.47/configure 2019-08-01 15:59:50.735018203 +0200
+++ cfitsio-3.47.soname/configure 2019-08-01 16:04:16.277042668 +0200
@@ -2293,7 +2293,7 @@
CFITSIO_MINOR=47
# Increment soname each time the interface changes:
-CFITSIO_SONAME=8
+CFITSIO_SONAME=7
#--------------------------------------------------------------------
diff -ur cfitsio-3.47/configure.in cfitsio-3.47.soname/configure.in
--- cfitsio-3.47/configure.in 2019-05-21 21:42:37.000000000 +0200
+++ cfitsio-3.47.soname/configure.in 2019-08-01 16:03:15.723124934 +0200
@@ -17,7 +17,7 @@
AC_SUBST(CFITSIO_MAJOR,3)
AC_SUBST(CFITSIO_MINOR,47)
# Increment soname each time the interface changes:
-AC_SUBST(CFITSIO_SONAME,8)
+AC_SUBST(CFITSIO_SONAME,7)
#--------------------------------------------------------------------
# Command options
diff -ur cfitsio-3.47/fitsio.h cfitsio-3.47.soname/fitsio.h
--- cfitsio-3.47/fitsio.h 2019-05-08 17:34:50.000000000 +0200
+++ cfitsio-3.47.soname/fitsio.h 2019-08-01 16:05:22.684049113 +0200
@@ -37,7 +37,7 @@
#define CFITSIO_VERSION 3.47
#define CFITSIO_MINOR 47
#define CFITSIO_MAJOR 3
-#define CFITSIO_SONAME 8
+#define CFITSIO_SONAME 7
/* the SONAME is incremented in a new release if the binary shared */
/* library (on linux and Mac systems) is not backward compatible */

9
cfitsio-pkgconfig.patch
Unescape View File

@ -1,7 +1,7 @@
diff -ur cfitsio/cfitsio.pc.in cfitsio.new/cfitsio.pc.in diff -ur cfitsio-3.47/cfitsio.pc.in cfitsio-3.47.pkg/cfitsio.pc.in
--- cfitsio/cfitsio.pc.in 2013-04-08 20:11:56.000000000 +0200 --- cfitsio-3.47/cfitsio.pc.in 2019-05-08 17:34:49.000000000 +0200
+++ cfitsio.new/cfitsio.pc.in 2013-07-10 18:42:11.105358864 +0200 +++ cfitsio-3.47.pkg/cfitsio.pc.in 2019-08-01 15:56:52.064310329 +0200
@@ -1,11 +1,11 @@ @@ -1,12 +1,12 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
@ -10,6 +10,7 @@ diff -ur cfitsio/cfitsio.pc.in cfitsio.new/cfitsio.pc.in
Name: cfitsio Name: cfitsio
Description: FITS File Subroutine Library Description: FITS File Subroutine Library
URL: https://heasarc.gsfc.nasa.gov/fitsio/
Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@ Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
-Libs: -L${libdir} -lcfitsio @LIBS@ -Libs: -L${libdir} -lcfitsio @LIBS@
-Libs.private: -lm -Libs.private: -lm

35
cfitsio-sformat.patch
Unescape View File

@ -0,0 +1,35 @@
diff -ur cfitsio-3.47/drvrnet.c cfitsio-3.47.sformat/drvrnet.c
--- cfitsio-3.47/drvrnet.c 2019-05-21 21:41:54.000000000 +0200
+++ cfitsio-3.47.sformat/drvrnet.c 2019-08-01 13:52:41.461958938 +0200
@@ -1257,9 +1257,9 @@
urlname = (char *)clientp;
if (urlname)
{
- fprintf(stderr,"Downloading ");
- fprintf(stderr,urlname);
- fprintf(stderr,"...\n");
+ fprintf(stderr,"%s","Downloading ");
+ fprintf(stderr,"%s",urlname);
+ fprintf(stderr,"%s","...\n");
}
isFirst = 0;
}
@@ -1270,13 +1270,13 @@
nToDisplay = fullBar;
fprintf(stderr,"%3d%% [",percent);
for (i=0; i<nToDisplay; ++i)
- fprintf(stderr,"=");
+ fprintf(stderr,"%s","=");
/* print remaining spaces */
for (i=nToDisplay; i<fullBar; ++i)
- fprintf(stderr," ");
- fprintf(stderr,"]\r");
+ fprintf(stderr,"%s"," ");
+ fprintf(stderr,"%s","]\r");
if (isComplete)
- fprintf(stderr,"\n");
+ fprintf(stderr,"%s","\n");
fflush(stderr);
}
return 0;
Sólo en cfitsio-3.47: .drvrnet.c.swp

18
cfitsio-zlib.patch
Unescape View File

@ -1,27 +1,27 @@
diff -Naur cfitsio/Makefile.in cfitsio.zlib/Makefile.in diff -ur cfitsio-3.47/Makefile.in cfitsio-3.47.zlib/Makefile.in
--- cfitsio/Makefile.in 2018-05-09 21:16:01.000000000 +0200 --- cfitsio-3.47/Makefile.in 2019-05-08 17:34:50.000000000 +0200
+++ cfitsio.zlib/Makefile.in 2018-05-23 13:54:43.878032943 +0200 +++ cfitsio-3.47.zlib/Makefile.in 2019-08-01 15:52:57.829760351 +0200
@@ -67,9 +67,7 @@ @@ -68,9 +68,7 @@
pliocomp.c fits_hcompress.c fits_hdecompress.c \ pliocomp.c fits_hcompress.c fits_hdecompress.c \
simplerng.c @GSIFTP_SRC@ simplerng.c @GSIFTP_SRC@
-ZLIB_SOURCES = zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \ -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/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
- zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c - zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c
+ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c +ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c
SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@ SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
@@ -102,7 +100,7 @@ @@ -103,7 +101,7 @@
shared: lib${PACKAGE}${SHLIB_SUFFIX} shared: lib${PACKAGE}${SHLIB_SUFFIX}
lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS} lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS} - ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS} + ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
@@ -139,28 +137,28 @@ @@ -140,28 +138,28 @@
${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $< ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
smem: smem.o lib${PACKAGE}.a ${OBJECTS} smem: smem.o lib${PACKAGE}.a ${OBJECTS}

25
cfitsio.spec
Unescape View File

@ -1,11 +1,11 @@
Name: cfitsio Name: cfitsio
Version: 3.450 Version: 3.470
Release: 4%{?dist} Release: 1%{?dist}
Summary: Library for manipulating FITS data files Summary: Library for manipulating FITS data files
License: MIT License: MIT
URL: http://heasarc.gsfc.nasa.gov/fitsio/ URL: http://heasarc.gsfc.nasa.gov/fitsio/
Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3450.tar.gz Source0: http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.47.tar.gz
# Unbundles zlib # Unbundles zlib
Patch0: cfitsio-zlib.patch Patch0: cfitsio-zlib.patch
# Remove soname version check # Remove soname version check
@ -14,6 +14,10 @@ Patch1: cfitsio-noversioncheck.patch
Patch2: cfitsio-pkgconfig.patch Patch2: cfitsio-pkgconfig.patch
# Use builder linker flags # Use builder linker flags
Patch3: cfitsio-ldflags.patch Patch3: cfitsio-ldflags.patch
# Patch some printf format errors
Patch4: cfitsio-sformat.patch
# Revert wrong soname increase
Patch5: cfitsio-3.47-soname.patch
BuildRequires: gcc-gfortran zlib-devel BuildRequires: gcc-gfortran zlib-devel
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
@ -72,18 +76,20 @@ compression algorithm.
%prep %prep
%setup -q -n cfitsio %setup -q -n cfitsio-3.47
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch5 -p1
# remove bundled zlib # remove bundled zlib
# not all the files inside zlib belong to zlib # not all the files inside zlib belong to zlib
pushd zlib pushd zlib
rm adler32.c crc32.c deflate.c infback.c inffast.c inflate.c inflate.h \ rm adler32.c crc32.c deflate.c infback.c inffast.c inflate.c inflate.h \
inftrees.c inftrees.h zlib.h deflate.h trees.c trees.h uncompr.c zconf.h \ inftrees.c inftrees.h zlib.h deflate.h trees.c trees.h uncompr.c zconf.h \
zutil.c zutil.h crc32.h inffast.h inffixed.h zutil.c zutil.h crc32.h inffast.h inffixed.h
popd popd
%build %build
@ -137,6 +143,11 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
%{_bindir}/funpack %{_bindir}/funpack
%changelog %changelog
* Thu Aug 01 2019 Sergio Pascual <sergiopr@fedoraproject.org> - 3.470-1
- Update to 3.470
- Patch to revert bogus soname increase
- Patch to fix fprintf format errors
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.450-4 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.450-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

2
sources
Unescape View File

@ -1 +1 @@
SHA512 (cfitsio3450.tar.gz) = f553f9bbedc3ffabf939bb507d3c41d6dc0d889b3a0835c23a7aff90ba98d7f9a6217527d69bc8984ce9bd9664681baeec5b1555d2ab51aaca003fdb5a08127e SHA512 (cfitsio-3.47.tar.gz) = c0502699e266928dd25abe57730dc4b357ccc9023789fe745324ae01aa688516aceaf37321ee578f0430111d9718f0fec0dc5b54c07f935529560f00b32ce1e3

Write Preview
Loading…
Cancel
Save