Reintroduce accidentally removed patch which fixes soname during library

build.
epel9
Matthew D Truch 15 years ago
parent 0f95a40bac
commit b3578672db

@ -1,7 +1,7 @@
diff -u cfitsio/configure cfitsio-fixed/configure diff -ur cfitsio/configure cfitio-fixed/configure
--- cfitsio/configure 2007-11-05 15:52:57.000000000 -0500 --- cfitsio/configure 2009-09-03 16:33:59.000000000 -0400
+++ cfitsio-fixed/configure 2008-09-19 18:50:51.000000000 -0400 +++ cfitio-fixed/configure 2009-11-02 15:33:12.000000000 -0500
@@ -3397,7 +3397,8 @@ @@ -4061,7 +4061,8 @@
SHLIB_SUFFIX=".sl" SHLIB_SUFFIX=".sl"
;; ;;
lnx) lnx)
@ -11,7 +11,7 @@ diff -u cfitsio/configure cfitsio-fixed/configure
;; ;;
osf) osf)
SHLIB_LD="ld -shared -expect_unresolved '*'" SHLIB_LD="ld -shared -expect_unresolved '*'"
@@ -3418,7 +3419,7 @@ @@ -4082,7 +4083,7 @@
# Darwin uses gcc (=cc), but needs different flags (see above) # Darwin uses gcc (=cc), but needs different flags (see above)
# if test "x$GCC" = xyes; then # if test "x$GCC" = xyes; then
if test "x$GCC" = xyes && test "x$EXT" != xdarwin && test "x$EXT" != xcygwin; then if test "x$GCC" = xyes && test "x$EXT" != xdarwin && test "x$EXT" != xcygwin; then
@ -20,9 +20,9 @@ diff -u cfitsio/configure cfitsio-fixed/configure
lhea_shlib_cflags='-fPIC' lhea_shlib_cflags='-fPIC'
fi fi
if test "x$lhea_shlib_cflags" != x; then if test "x$lhea_shlib_cflags" != x; then
diff -u cfitsio/Makefile.in cfitsio-fixed/Makefile.in diff -ur cfitsio/Makefile.in cfitio-fixed/Makefile.in
--- cfitsio/Makefile.in 2008-01-14 13:30:51.000000000 -0500 --- cfitsio/Makefile.in 2009-07-14 16:40:37.000000000 -0400
+++ cfitsio-fixed/Makefile.in 2008-09-19 18:51:41.000000000 -0400 +++ cfitio-fixed/Makefile.in 2009-11-02 15:33:12.000000000 -0500
@@ -22,8 +22,8 @@ @@ -22,8 +22,8 @@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
DESTDIR = DESTDIR =

@ -1,6 +1,6 @@
Name: cfitsio Name: cfitsio
Version: 3.210 Version: 3.210
Release: 1%{?dist} Release: 2%{?dist}
Summary: Library for manipulating FITS data files Summary: Library for manipulating FITS data files
Group: Development/Libraries Group: Development/Libraries
@ -8,6 +8,7 @@ License: GPLv2+
URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: cfitsio.patch
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
@ -49,6 +50,7 @@ Stand-alone documentation for cfitsio.
%prep %prep
%setup -q -n cfitsio %setup -q -n cfitsio
%patch0 -p1
%build %build
FC=f95 FC=f95
@ -76,7 +78,6 @@ mkdir -p %{buildroot}%{_includedir}/%{name}
make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_LIB=%{buildroot}%{_libdir} \ make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_LIB=%{buildroot}%{_libdir} \
CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} install CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} install
pushd %{buildroot}%{_libdir} pushd %{buildroot}%{_libdir}
mv libcfitsio.so libcfitsio.so.0
ln -s libcfitsio.so.0 libcfitsio.so ln -s libcfitsio.so.0 libcfitsio.so
popd popd
@ -107,6 +108,9 @@ rm -rf %{buildroot}
%doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps %doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps
%changelog %changelog
* Mon Nov 2 2009 Matthew Truch <matt at truch.net> - 3.210-2
- Re-introduce library soname patch (accidentally removed it).
* Tue Oct 20 2009 Matthew Truch <matt at truch.net> - 3.210-1 * Tue Oct 20 2009 Matthew Truch <matt at truch.net> - 3.210-1
- Update to upstream 3.210 release. - Update to upstream 3.210 release.

Loading…
Cancel
Save