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

New upstream (3.360)

Browse Source
epel9
Sergio Pascual 11 years ago
parent 4571220455
commit 3cd4a2a30e
4 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -7,3 +7,4 @@ cfitsio3250.tar.gz
/cfitsio3330.tar.gz /cfitsio3330.tar.gz
/cfitsio3340.tar.gz /cfitsio3340.tar.gz
/cfitsio3350.tar.gz /cfitsio3350.tar.gz
/cfitsio3360.tar.gz

24
cfitsio-zlib.patch
Unescape View File

@ -1,16 +1,18 @@
diff -ur cfitsio/Makefile.in cfitsio.new/Makefile.in diff -ur cfitsio/Makefile.in cfitsio.no-zlib/Makefile.in
--- cfitsio/Makefile.in 2013-04-08 20:11:42.000000000 +0200 --- cfitsio/Makefile.in 2013-12-05 23:20:57.000000000 +0100
+++ cfitsio.new/Makefile.in 2013-07-04 00:03:13.314991071 +0200 +++ cfitsio.no-zlib/Makefile.in 2013-12-09 11:05:55.332013282 +0100
@@ -61,8 +61,6 @@ @@ -62,9 +62,7 @@
putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.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 \ pliocomp.c fits_hcompress.c fits_hdecompress.c
- adler32.c crc32.c inffast.c inftrees.c trees.c zutil.c \
- deflate.c infback.c inflate.c uncompr.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} shared: libcfitsio${SHLIB_SUFFIX}
libcfitsio${SHLIB_SUFFIX}: ${OBJECTS} libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
@ -19,7 +21,7 @@ diff -ur cfitsio/Makefile.in cfitsio.new/Makefile.in
@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} $@; \
@@ -116,13 +114,13 @@ @@ -118,13 +116,13 @@
${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm ${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
testprog: testprog.o libcfitsio.a ${OBJECTS} testprog: testprog.o libcfitsio.a ${OBJECTS}

29
cfitsio.spec
Unescape View File

@ -1,11 +1,11 @@
Name: cfitsio Name: cfitsio
Version: 3.350 Version: 3.360
Release: 2%{?dist} Release: 1%{?dist}
Summary: Library for manipulating FITS data files Summary: Library for manipulating FITS data files
Group: Development/Libraries Group: Development/Libraries
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/cfitsio3350.tar.gz Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3360.tar.gz
# Unbundles zlib # Unbundles zlib
Patch0: cfitsio-zlib.patch Patch0: cfitsio-zlib.patch
# Remove soname version check # Remove soname version check
@ -81,18 +81,18 @@ compression algorithm.
%patch2 -p1 %patch2 -p1
# remove bundled zlib # remove bundled zlib
# not all the files inside zlib belong to 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 zutil.c zutil.h crc32.h inffast.h inffixed.h
popd
%build %build
export FC=f95
export CC=gcc # fixes -O*, -g
%configure --enable-reentrant %configure --enable-reentrant
make shared %{?_smp_mflags} make shared %{?_smp_mflags}
make fpack %{?_smp_mflags} make fpack %{?_smp_mflags}
make funpack %{?_smp_mflags} make funpack %{?_smp_mflags}
unset FC
%check %check
make testprog make testprog
@ -108,18 +108,18 @@ make LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} \
CFITSIO_LIB=%{buildroot}%{_libdir} \ CFITSIO_LIB=%{buildroot}%{_libdir} \
CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} \ CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} \
install install
# make is not installing properly the shared libs
cp -d libcfitsio.so.* %{buildroot}%{_libdir}
chmod 755 %{buildroot}%{_libdir}/libcfitsio.so.*
cp -p f{,un}pack %{buildroot}%{_bindir} cp -p f{,un}pack %{buildroot}%{_bindir}
chmod 755 %{buildroot}%{_libdir}/libcfitsio.so.*
chmod 755 %{buildroot}%{_bindir}/f{,un}pack chmod 755 %{buildroot}%{_bindir}/f{,un}pack
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%doc README License.txt changes.txt %doc README License.txt docs/changes.txt
%{_libdir}/libcfitsio.so.* %{_libdir}/libcfitsio.so.*
%files devel %files devel
@ -132,14 +132,17 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
%{_libdir}/libcfitsio.a %{_libdir}/libcfitsio.a
%files docs %files docs
%doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps License.txt %doc docs/fitsio.doc docs/fitsio.pdf docs/cfitsio.doc docs/cfitsio.pdf License.txt
%files -n fpack %files -n fpack
%doc fpackguide.pdf License.txt %doc docs/fpackguide.pdf License.txt
%{_bindir}/fpack %{_bindir}/fpack
%{_bindir}/funpack %{_bindir}/funpack
%changelog %changelog
* Mon Dec 09 2013 Sergio Pascual <sergiopr@fedoraproject.org> - 3.360-1
- New upstream (3.360)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.350-2 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.350-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

2
sources
Unescape View File

@ -1 +1 @@
0bc79cd8eeabbcd26828f64269e39e63 cfitsio3350.tar.gz f98d8782b78594210def81234dfe79df cfitsio3360.tar.gz

Write Preview
Loading…
Cancel
Save