rpms/cfitsio/FC-5 cfitsio.patch,1.1,1.2 cfitsio.spec,1.15,1.16

[Matthew D Truch (mtruch)]

Author: mtruch

Update of /cvs/extras/rpms/cfitsio/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31803/FC-5

Modified Files:
	cfitsio.patch cfitsio.spec 
Log Message:
Fix build process to put files where they belong.  


cfitsio.patch:

Index: cfitsio.patch
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-5/cfitsio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cfitsio.patch	13 Nov 2005 19:50:32 -0000	1.1
+++ cfitsio.patch	7 Dec 2006 20:20:44 -0000	1.2
@@ -20,23 +20,17 @@
    lhea_shlib_cflags='-fPIC'
  fi
  if test "x$lhea_shlib_cflags" != x; then
-diff -u cfitsio/Makefile.in cfitsio-new/Makefile.in
---- cfitsio/Makefile.in	2005-04-26 11:48:05.000000000 -0400
-+++ cfitsio-new/Makefile.in	2005-11-13 13:52:27.000000000 -0500
-@@ -19,8 +19,8 @@
- #
+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
++CFITSIO_LIB    = $(exec_prefix)/$(LIBDIR)
++CFITSIO_INCLUDE        = $(prefix)/$(INCLUDEDIR)
+ INSTALL_DIRS	= @INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE}
  
- CFITSIO_PREFIX	= @CFITSIO_PREFIX@
--CFITSIO_LIB	= ${CFITSIO_PREFIX}/lib
--CFITSIO_INCLUDE	= ${CFITSIO_PREFIX}/include
-+CFITSIO_LIB	= ${CFITSIO_PREFIX}/${LIBDIR}
-+CFITSIO_INCLUDE	= ${CFITSIO_PREFIX}/${INCLUDEDIR}
  
- SHELL =		/bin/sh
- RANLIB =	@RANLIB@
-@@ -146,4 +146,4 @@
- objs: ${CORE_OBJECTS}
- 
- ${CFITSIO_PREFIX} ${CFITSIO_LIB} ${CFITSIO_INCLUDE}:
--	@if [ ! -d $@ ]; then mkdir $@; fi
-+	@if [ ! -d $@ ]; then mkdir -p $@; fi


Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/FC-5/cfitsio.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cfitsio.spec	5 Dec 2006 21:11:30 -0000	1.15
+++ cfitsio.spec	7 Dec 2006 20:20:44 -0000	1.16
@@ -1,12 +1,12 @@
 Name:           cfitsio
 Version:        3.020
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3006.tar.gz
+Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3020.tar.gz
 Patch:          cfitsio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,7 +46,10 @@
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
-make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_PREFIX=%{buildroot}%{_prefix} install
+mkdir -p %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_includedir}/%{name}
+make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_LIB=%{buildroot}%{_libdir} \
+     CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} install
 pushd %{buildroot}%{_libdir}
 ln -s libcfitsio.so.0 libcfitsio.so
 popd
@@ -68,8 +71,13 @@
 %{_includedir}/%{name}
 %{_libdir}/libcfitsio.a
 %{_libdir}/libcfitsio.so
+%{_libdir}/pkgconfig/cfitsio.pc
 
 %changelog
+* Fri Dec 8 2006 Matthew Truch <matt at truch.net> - 3.020-2
+- Modify spec file to install to correct directories.
+- Package cfitsio.pc file in -devel package.
+
 * Wed Dec 5 2006 Matthew Truch <matt at truch.net> - 3.020-1
 - Upgrade to cfitsio 3.020 release.