Need the corrected patch file.

epel9
Matthew D Truch 18 years ago
parent f43a4fc21b
commit 4b40cfaab5

@ -20,18 +20,17 @@ diff -u cfitsio/configure cfitsio-new/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 Makefile.in.orig Makefile.in diff -u old/Makefile.in new/Makefile.in
--- Makefile.in.orig 2006-10-12 17:14:41.000000000 -0400 --- old/Makefile.in 2006-10-12 17:14:41.000000000 -0400
+++ Makefile.in 2006-12-05 16:29:51.000000000 -0500 +++ new/Makefile.in 2006-12-05 16:36:24.000000000 -0500
@@ -21,8 +21,8 @@ @@ -21,8 +21,8 @@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
CFITSIO_PREFIX = $(prefix) CFITSIO_PREFIX = $(prefix)
-CFITSIO_LIB = $(exec_prefix)/lib -CFITSIO_LIB = $(exec_prefix)/lib
-CFITSIO_INCLUDE = $(prefix)/include -CFITSIO_INCLUDE = $(prefix)/include
+CFITSIO_LIB = $(exec_prefix)/$(LIBDIR) +CFITSIO_LIB = $(exec_prefix)/$(LIBDIR)
+CFITSIO_INCLUDE = $(prefix)/$(INCLUDEDIR) +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}

@ -1,6 +1,6 @@
Name: cfitsio Name: cfitsio
Version: 3.020 Version: 3.020
Release: 2%{?dist} Release: 3%{?dist}
Summary: Library for manipulating FITS data files Summary: Library for manipulating FITS data files
Group: Development/Libraries Group: Development/Libraries
@ -74,6 +74,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/cfitsio.pc %{_libdir}/pkgconfig/cfitsio.pc
%changelog %changelog
* Fri Dec 8 2006 Matthew Truch <matt at truch.net> - 3.020-3
- Commit correct patch to configure and Makefiles.
* Fri Dec 8 2006 Matthew Truch <matt at truch.net> - 3.020-2 * Fri Dec 8 2006 Matthew Truch <matt at truch.net> - 3.020-2
- Modify spec file to install to correct directories. - Modify spec file to install to correct directories.
- Package cfitsio.pc file in -devel package. - Package cfitsio.pc file in -devel package.

Loading…
Cancel
Save