From 4b40cfaab5effa54baf44e765baea93deea8b3f9 Mon Sep 17 00:00:00 2001 From: Matthew D Truch Date: Thu, 7 Dec 2006 20:11:26 +0000 Subject: [PATCH] Need the corrected patch file. --- cfitsio.patch | 23 +++++++++++------------ cfitsio.spec | 5 ++++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/cfitsio.patch b/cfitsio.patch index a1b0c03..4be598b 100644 --- a/cfitsio.patch +++ b/cfitsio.patch @@ -20,18 +20,17 @@ diff -u cfitsio/configure cfitsio-new/configure lhea_shlib_cflags='-fPIC' fi if test "x$lhea_shlib_cflags" != x; then -diff -u Makefile.in.orig Makefile.in ---- Makefile.in.orig 2006-10-12 17:14:41.000000000 -0400 -+++ Makefile.in 2006-12-05 16:29:51.000000000 -0500 +diff -u old/Makefile.in new/Makefile.in +--- old/Makefile.in 2006-10-12 17:14:41.000000000 -0400 ++++ new/Makefile.in 2006-12-05 16:36:24.000000000 -0500 @@ -21,8 +21,8 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - CFITSIO_PREFIX = $(prefix) --CFITSIO_LIB = $(exec_prefix)/lib --CFITSIO_INCLUDE = $(prefix)/include + prefix = @prefix@ + exec_prefix = @exec_prefix@ + CFITSIO_PREFIX = $(prefix) +-CFITSIO_LIB = $(exec_prefix)/lib +-CFITSIO_INCLUDE = $(prefix)/include +CFITSIO_LIB = $(exec_prefix)/$(LIBDIR) +CFITSIO_INCLUDE = $(prefix)/$(INCLUDEDIR) - INSTALL_DIRS = @INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE} - - - + INSTALL_DIRS = @INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE} + + diff --git a/cfitsio.spec b/cfitsio.spec index 0e464bc..ad9052a 100644 --- a/cfitsio.spec +++ b/cfitsio.spec @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.020 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -74,6 +74,9 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/cfitsio.pc %changelog +* Fri Dec 8 2006 Matthew Truch - 3.020-3 +- Commit correct patch to configure and Makefiles. + * Fri Dec 8 2006 Matthew Truch - 3.020-2 - Modify spec file to install to correct directories. - Package cfitsio.pc file in -devel package.