rpms/cfitsio/devel .cvsignore, 1.11, 1.12 cfitsio.spec, 1.35, 1.36 sources, 1.11, 1.12

[Matthew D Truch]

Author: mtruch

Update of /cvs/extras/rpms/cfitsio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20795

Modified Files:
	.cvsignore cfitsio.spec sources 
Log Message:
Update to upstream release (new features, thread safe library, bugfixes).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	24 Jul 2009 16:38:53 -0000	1.11
+++ .cvsignore	20 Oct 2009 21:19:49 -0000	1.12
@@ -1 +1 @@
-cfitsio3140.tar.gz
+cfitsio3210.tar.gz


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- cfitsio.spec	24 Jul 2009 16:41:46 -0000	1.35
+++ cfitsio.spec	20 Oct 2009 21:19:49 -0000	1.36
@@ -1,13 +1,12 @@
 Name:           cfitsio
-Version:        3.140
-Release:        2%{?dist}
+Version:        3.210
+Release:        1%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3140.tar.gz
-Patch:          cfitsio.patch
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     gcc-gfortran
@@ -50,7 +49,6 @@ Stand-alone documentation for cfitsio.
 
 %prep
 %setup -q -n cfitsio
-%patch -p1
 
 %build
 FC=f95
@@ -63,9 +61,6 @@ unset FC
 sed 's|${exec_prefix}/lib|${exec_prefix}/%{_lib}|' cfitsio.pc >cfitsio.pc.new
 sed 's|${prefix}/include|${prefix}/include/%{name}|' cfitsio.pc.new >cfitsio.pc
 rm -f cfitsio.pc.new
-# Manually correct pkgconfig .pc file version
-sed 's|3.006|%{version}|' cfitsio.pc >cfitsio.pc.new
-mv cfitsio.pc.new cfitsio.pc
 
 %check
 make testprog
@@ -81,6 +76,7 @@ mkdir -p %{buildroot}%{_includedir}/%{na
 make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_LIB=%{buildroot}%{_libdir} \
      CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} install
 pushd %{buildroot}%{_libdir}
+mv libcfitsio.so libcfitsio.so.0
 ln -s libcfitsio.so.0 libcfitsio.so
 popd
 
@@ -111,6 +107,9 @@ rm -rf %{buildroot}
 %doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps
 
 %changelog
+* Tue Oct 20 2009 Matthew Truch <matt at truch.net> - 3.210-1
+- Update to upstream 3.210 release.
+
 * Fri Jul 24 2009 Matthew Truch <matt at truch.net> - 3.140-2
 - Bump to include proper tarball.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	24 Jul 2009 16:38:53 -0000	1.11
+++ sources	20 Oct 2009 21:19:49 -0000	1.12
@@ -1 +1 @@
-7467fdacb807ebeef7fe088f2b69d9ee  cfitsio3140.tar.gz
+30f7e968983f6f46162f12368b68c42a  cfitsio3210.tar.gz