- updated to 3.370 (note: soname changed)

- updated zlib patch
- removed obsolete link patch

diff --git a/cfitsio-link.patch b/cfitsio-link.patch
deleted file mode 100644 (file)
index b708961..0000000
--- a/cfitsio-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cfitsio/Makefile.in.orig   2006-10-12 23:14:41.000000000 +0200
-+++ cfitsio/Makefile.in        2006-12-11 23:33:23.384139444 +0100
-@@ -87,7 +87,7 @@
- shared: libcfitsio${SHLIB_SUFFIX}
- 
- libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
--              ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS}
-+              ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm
- 
- install:      libcfitsio.a $(INSTALL_DIRS)
-               @if [ -f libcfitsio.a ]; then \

diff --git a/cfitsio-zlib.patch b/cfitsio-zlib.patch
index 22db953624a5c8cc20b979884247b334ea25a0f5..33029b36be0b3ee1434ab14c8a76795ea2aaa90f 100644 (file)
--- a/cfitsio-zlib.patch
+++ b/cfitsio-zlib.patch
@@ -1,25 +1,26 @@
---- cfitsio/Makefile.in.orig   2011-08-22 08:20:52.649373665 +0200
-+++ cfitsio/Makefile.in        2011-08-22 08:26:21.099373501 +0200
-@@ -55,9 +55,7 @@ CORE_SOURCES =       buffers.c cfileio.c chec
-               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
+--- cfitsio/Makefile.in.orig   2014-11-13 20:35:55.016255682 +0100
++++ cfitsio/Makefile.in        2014-11-13 20:41:17.506242144 +0100
+@@ -63,9 +63,8 @@
+               pliocomp.c fits_hcompress.c fits_hdecompress.c \
+               simplerng.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
  
-@@ -90,7 +88,7 @@ libcfitsio.a:        ${OBJECTS}
+ SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
+ 
+@@ -98,7 +97,7 @@
  shared: libcfitsio${SHLIB_SUFFIX}
  
  libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
--              ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm
-+              ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm -lz
- 
- install:      libcfitsio.a $(INSTALL_DIRS)
-               @if [ -f libcfitsio.a ]; then \
+-              ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS}
++              ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz ${LIBS}
+               @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
+                       ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
+                       ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
 --- cfitsio/cfitsio.pc.in.orig 2011-05-12 20:35:39.000000000 +0200
 +++ cfitsio/cfitsio.pc.in      2011-08-22 08:26:36.306040160 +0200
 @@ -7,5 +7,5 @@ Name: cfitsio

diff --git a/cfitsio.spec b/cfitsio.spec
index 1850fc4fa1ee4971b26eecba2a88b546826af81d..9e3e74919787d5ec3c76407c0485f24dc8060d96 100644 (file)
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,16 +1,15 @@
 Summary:       CFITSIO Interface Library
 Summary(pl.UTF-8):     Biblioteka interfejsu CFITSIO
 Name:          cfitsio
-Version:       3.280
+Version:       3.370
 %define        sver    %(echo %{version} | tr -d .)
 Release:       1
 License:       MIT-like
 Group:         Libraries
 Source0:       ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/%{name}%{sver}.tar.gz
-# Source0-md5: fdb9c0f51678b47e78592c70fb5dc793
-Patch0:                %{name}-link.patch
-Patch1:                %{name}-ldflags.patch
-Patch2:                %{name}-zlib.patch
+# Source0-md5: abebd2d02ba5b0503c633581e3bfa116
+Patch0:                %{name}-ldflags.patch
+Patch1:                %{name}-zlib.patch
 URL:           http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
 BuildRequires: gcc-g77
 BuildRequires: zlib-devel
@@ -53,12 +52,11 @@ Statyczna wersja biblioteki CFITSIO.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
-%patch1 -p0
-%patch2 -p1
+%patch0 -p0
+%patch1 -p1
 
 # enforce headers from system zlib
-%{__rm} crc32.h deflate.h inffast.h inffixed.h inflate.h inftrees.h zconf.h zlib.h zutil.h
+%{__rm} zlib/{crc32.h,deflate.h,inffast.h,inffixed.h,inflate.h,inftrees.h,zconf.h,zlib.h,zutil.h}
 
 %build
 %configure
@@ -81,12 +79,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc License.txt README changes.txt
-%attr(755,root,root) %{_libdir}/libcfitsio.so
+%doc License.txt README docs/changes.txt
+%attr(755,root,root) %{_libdir}/libcfitsio.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcfitsio.so.2
 
 %files devel
 %defattr(644,root,root,755)
-%doc cfitsio.doc cfitsio.ps fitsio.doc fitsio.ps quick.ps
+%doc docs/{cfitsio.doc,cfitsio.ps,fitsio.doc,fitsio.ps,quick.ps}
+%attr(755,root,root) %{_libdir}/libcfitsio.so
 %{_includedir}/drvrsmem.h
 %{_includedir}/fitsio*.h
 %{_includedir}/longnam.h