diff --git a/.gitignore b/.gitignore index c59fabb..b38035d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ cfitsio3250.tar.gz /cfitsio3290.tar.gz /beta_cfitsio3300.tar.gz /cfitsio3310.tar.gz +/cfitsio3330.tar.gz diff --git a/cfitsio.spec b/cfitsio.spec index 0ff4d3a..c7490e2 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -1,14 +1,13 @@ Name: cfitsio Version: 3.330 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries License: MIT URL: http://heasarc.gsfc.nasa.gov/fitsio/ Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3330.tar.gz -Patch0: cfitsio.patch # Unbundles zlib -Patch1: cfitsio-zlib.patch +Patch0: cfitsio-zlib.patch BuildRequires: gcc-gfortran zlib-devel Requires(post): /sbin/ldconfig @@ -74,7 +73,6 @@ compression algorithm. %prep %setup -q -n cfitsio %patch0 -p1 -%patch1 -p1 # Fixing cfitsio.pc.in sed -e 's|includedir=@includedir@|includedir=@includedir@/cfitsio|' -i cfitsio.pc.in sed -e 's|Libs: -L${libdir} -lcfitsio @LIBS@|Libs: -L${libdir} -lcfitsio|' -i cfitsio.pc.in @@ -91,8 +89,8 @@ FC=f95 export FC export CC=gcc # fixes -O*, -g %configure --enable-reentrant -make shared %{?_smp_mflags} -ln -s libcfitsio.so.0 libcfitsio.so +make shared %{?_smp_mflags} SHLIB_LD="gcc -shared -Wl,-soname,libcfitsio.so.%{version}" SHLIB_SUFFIX=".so.%{version}" +ln -s libcfitsio.so.%{version} libcfitsio.so make fpack %{?_smp_mflags} make funpack %{?_smp_mflags} unset FC @@ -109,9 +107,9 @@ mkdir -p %{buildroot} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir}/%{name} make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_LIB=%{buildroot}%{_libdir} \ - CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} install + CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} SHLIB_SUFFIX=".so.%{version}" install pushd %{buildroot}%{_libdir} -ln -s libcfitsio.so.0 libcfitsio.so +ln -s libcfitsio.so.%{version} libcfitsio.so popd mkdir %{buildroot}%{_bindir} cp -p f{,un}pack %{buildroot}%{_bindir}/ @@ -142,6 +140,9 @@ cp -p f{,un}pack %{buildroot}%{_bindir}/ %{_bindir}/funpack %changelog +* Sun Mar 17 2013 Sergio Pascual - 3.330-2 +- Soname contains full package version (upstream doesn't track API changes) + * Sun Mar 10 2013 Sergio Pascual - 3.330-1 - New upstream version - Reverted the patch removing run time check diff --git a/sources b/sources index e61f7ea..1d7e195 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75b6411751c7f308d45b281b7beb92d6 cfitsio3310.tar.gz +79d4d9ec3831dc2c0242c16bb97a4de2 cfitsio3330.tar.gz