rpms/cfitsio/devel cfitsio.spec,1.1,1.2

[Matthew D Truch (mtruch)]

Author: mtruch

Update of /cvs/extras/rpms/cfitsio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19875/devel

Modified Files:
	cfitsio.spec 
Log Message:
auto-import cfitsio-3.004-0.8.b on branch devel from cfitsio-3.004-0.8.b.src.rpm
Spec file fixes as per bug 172042


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cfitsio.spec	13 Nov 2005 00:15:39 -0000	1.1
+++ cfitsio.spec	13 Nov 2005 00:34:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           cfitsio
 Version:        3.004
-Release:        0.6.b
+Release:        0.8.b
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
@@ -41,16 +41,23 @@
 FC=g95
 export FC
 %configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name}
+cat Makefile |  \
+  sed -e 's|cc -shared|cc -shared -Wl,-soname,libcfitsio.so.0|g'  \
+  > Makefile.new
+mv Makefile.new Makefile
 make shared %{?_smp_mflags}
-
+unset FC
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
 make install
 #move headers to correct location (configure doesn't obey --includedir)
-mkdir -p %{buildroot}/%{_includedir}/%{name}
-mv %{buildroot}/%{_includedir}/*.h %{buildroot}/%{_includedir}/%{name}
+mkdir -p %{buildroot}%{_includedir}/%{name}
+mv %{buildroot}%{_includedir}/*.h %{buildroot}%{_includedir}/%{name}
+pushd %{buildroot}%{_libdir}
+ln -s libcfitsio.so libcfitsio.so.0
+popd
 
 %clean
 rm -rf %{buildroot}
@@ -62,14 +69,19 @@
 %files
 %defattr(-,root,root,-)
 %doc README Licence.txt changes.txt fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps
-/%{_prefix}/%{_lib}/libcfitsio.so
+%{_libdir}/libcfitsio.so*
 
 %files devel
-/%{_includedir}/%{name}
-/%{_includedir}/%{name}/*.h
-/%{_prefix}/%{_lib}/libcfitsio.a
+%{_includedir}/%{name}
+%{_libdir}/libcfitsio.a
 
 %changelog
+* Sat Nov 12 2005 Matthew Truch <matt at truch.net> - 3.004-0.8.b
+- unset FC once we are done with the build
+
+* Sat Nov 12 2005 Ed Hill <ed at eh3.com> - 3.004-0.7.b
+- shared libs and small cleanups
+
 * Sun Nov 06 2005 Matthew Truch <matt at truch.net> - 3.004-0.6.b
 - Own include directory created by the devel package.