From d74f8671e8f592f5c5a2b469fd4ec9c9ec98a022 Mon Sep 17 00:00:00 2001 From: Matthew D Truch Date: Sun, 13 Nov 2005 00:34:33 +0000 Subject: [PATCH] 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 --- cfitsio.spec | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/cfitsio.spec b/cfitsio.spec index db34cd5..1b14d00 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -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 @@ Headers required when building a program against the cfitsio library. 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 @@ rm -rf %{buildroot} %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 - 3.004-0.8.b +- unset FC once we are done with the build + +* Sat Nov 12 2005 Ed Hill - 3.004-0.7.b +- shared libs and small cleanups + * Sun Nov 06 2005 Matthew Truch - 3.004-0.6.b - Own include directory created by the devel package.