From b21c90327b38217bc604c5c883bf551fd0bb7cd5 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 5 Dec 2011 11:22:52 +0100 Subject: [PATCH] New upstream version Reorganizing patches --- .gitignore | 1 + cfitsio-pkgconfig-reentrant.patch | 9 -------- cfitsio-pkgconfig.patch | 12 ----------- cfitsio.patch | 12 ----------- cfitsio.spec | 35 +++++++++++++------------------ sources | 2 +- 6 files changed, 17 insertions(+), 54 deletions(-) delete mode 100644 cfitsio-pkgconfig-reentrant.patch delete mode 100644 cfitsio-pkgconfig.patch diff --git a/.gitignore b/.gitignore index 9e82aaf..735507b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ cfitsio3250.tar.gz /cfitsio3270.tar.gz /cfitsio3280.tar.gz +/cfitsio3290.tar.gz diff --git a/cfitsio-pkgconfig-reentrant.patch b/cfitsio-pkgconfig-reentrant.patch deleted file mode 100644 index b21137d..0000000 --- a/cfitsio-pkgconfig-reentrant.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -ur cfitsio/cfitsio.pc.in cfitsio.new/cfitsio.pc.in ---- cfitsio/cfitsio.pc.in 2011-10-29 16:54:43.081132723 +0200 -+++ cfitsio.new/cfitsio.pc.in 2011-10-29 16:56:49.933619756 +0200 -@@ -8,4 +8,4 @@ - Version: 3.280 - Libs: -L${libdir} -lcfitsio @LIBS@ - Libs.private: -lm --Cflags: -I${includedir} -+Cflags: -D_REENTRANT -I${includedir} diff --git a/cfitsio-pkgconfig.patch b/cfitsio-pkgconfig.patch deleted file mode 100644 index 40b1d5c..0000000 --- a/cfitsio-pkgconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur cfitsio/cfitsio.pc.in cfitsio-pkgconfig/cfitsio.pc.in ---- cfitsio/cfitsio.pc.in 2010-01-26 12:39:34.000000000 -0500 -+++ cfitsio-pkgconfig/cfitsio.pc.in 2010-02-21 15:18:26.000000000 -0500 -@@ -5,7 +5,7 @@ - - Name: cfitsio - Description: FITS File Subroutine Library --Version: 3.28 -+Version: 3.280 - Libs: -L${libdir} -lcfitsio @LIBS@ - Libs.private: -lm - Cflags: -I${includedir} diff --git a/cfitsio.patch b/cfitsio.patch index 6d83499..c38f274 100644 --- a/cfitsio.patch +++ b/cfitsio.patch @@ -20,15 +20,3 @@ diff -ur cfitsio/configure cfitsio-fixed/configure lhea_shlib_cflags='-fPIC' fi if test "x$lhea_shlib_cflags" != x; then -diff -ur cfitsio/Makefile.in cfitsio-fixed/Makefile.in ---- cfitsio/Makefile.in 2011-01-10 12:04:46.000000000 -0500 -+++ cfitsio-fixed/Makefile.in 2011-04-11 11:33:54.385980894 -0400 -@@ -22,8 +22,8 @@ - exec_prefix = @exec_prefix@ - DESTDIR = - CFITSIO_PREFIX = $(prefix) --CFITSIO_LIB = $(DESTDIR)$(exec_prefix)/lib --CFITSIO_INCLUDE = $(DESTDIR)$(prefix)/include -+CFITSIO_LIB = $(DESTDIR)$(exec_prefix)/$(LIBDIR) -+CFITSIO_INCLUDE = $(DESTDIR)$(prefix)/$(INCLUDEDIR) - INSTALL_DIRS = $(DESTDIR)@INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE} diff --git a/cfitsio.spec b/cfitsio.spec index 88db4b4..4f01db8 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -1,18 +1,15 @@ Name: cfitsio -Version: 3.280 -Release: 2%{?dist} +Version: 3.290 +Release: 1%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries License: MIT URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html -Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3280.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3290.tar.gz Patch0: cfitsio.patch -Patch1: cfitsio-pkgconfig.patch +Patch1: makefile.patch Patch2: cfitsio-s390.patch -Patch3: makefile.patch -Patch4: cfitsio-pkgconfig-reentrant.patch BuildRequires: gcc-gfortran Requires(post): /sbin/ldconfig @@ -80,8 +77,13 @@ compression algorithm. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 +# Fixing cfitsio.pc.in +sed -e 's|3.29|3.290|' -i cfitsio.pc.in +sed -e 's|Libs: -L${libdir} -lcfitsio @LIBS@|Libs: -L${libdir} -lcfitsio|' -i cfitsio.pc.in +sed -e 's|Libs.private: -lm|Libs.private: @LIBS@ -lm|' -i cfitsio.pc.in +sed -e 's|Cflags: -I${includedir}|Cflags: -D_REENTRANT -I${includedir}|' -i cfitsio.pc.in +# Manually fix pkgconfig .pc.in file (BZ 436539, BZ 618291) +sed -e 's|includedir=@includedir@|includedir=@includedir@/cfitsio|' -i cfitsio.pc.in %build FC=f95 @@ -93,9 +95,6 @@ ln -s libcfitsio.so.0 libcfitsio.so make fpack %{?_smp_mflags} make funpack %{?_smp_mflags} unset FC -# Manually fix pkgconfig .pc file (BZ 436539, BZ 618291) -sed 's|/usr/include|/usr/include/%{name}|' cfitsio.pc >cfitsio.pc.new -mv cfitsio.pc.new cfitsio.pc %check make testprog @@ -116,40 +115,36 @@ popd mkdir %{buildroot}%{_bindir} cp -p f{,un}pack %{buildroot}%{_bindir}/ -%clean -rm -rf %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc README License.txt changes.txt %{_libdir}/libcfitsio.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/%{name} %{_libdir}/libcfitsio.so %{_libdir}/pkgconfig/cfitsio.pc %files static -%defattr(-,root,root,-) %doc License.txt %{_libdir}/libcfitsio.a %files docs -%defattr(-,root,root,-) %doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps License.txt %files -n fpack -%defattr(-,root,root,-) %doc fpackguide.pdf License.txt %{_bindir}/fpack %{_bindir}/funpack %changelog +* Mon Dec 05 2011 Sergio Pascual - 3.290-1 +- New upstream version +- Reorganizing patches + * Sat Oct 29 2011 Sergio Pascual - 3.280-2 - Enable multithreading support diff --git a/sources b/sources index 49911c0..d2e6ce1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fdb9c0f51678b47e78592c70fb5dc793 cfitsio3280.tar.gz +d0d460c5e314a15fa6905b2096159827 cfitsio3290.tar.gz