rpms/libindi/devel libindi-cfitsio.patch, 1.1, 1.2 libindi.spec, 1.2, 1.3

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/libindi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16696

Modified Files:
	libindi-cfitsio.patch libindi.spec 
Log Message:
* Sat Feb 14 2009 Sergio Pascual <sergiopr at fedoraproject.org> -  0.6-4
- Fixed patch to find cfitsio


libindi-cfitsio.patch:

Index: libindi-cfitsio.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libindi/devel/libindi-cfitsio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libindi-cfitsio.patch	14 Feb 2009 15:53:47 -0000	1.1
+++ libindi-cfitsio.patch	14 Feb 2009 16:18:10 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur libindi0-0.6/CMakeLists.txt libindi0-0.6.new/CMakeLists.txt
---- libindi0-0.6/CMakeLists.txt	2008-11-18 10:45:06.000000000 +0100
-+++ libindi0-0.6.new/CMakeLists.txt	2009-02-14 16:43:30.000000000 +0100
+--- libindi0-0.6/CMakeLists.txt	2009-02-14 17:11:38.000000000 +0100
++++ libindi0-0.6.new/CMakeLists.txt	2009-02-14 17:14:04.000000000 +0100
 @@ -15,13 +15,14 @@
  include (MacroLogFeature)
  include (MacroBoolTo01)
@@ -8,13 +8,12 @@
 +include (FindPkgConfig)
  
  find_package(ZLIB REQUIRED)
--
-+pkg_check_modules(CFITSIO REQUIRED cfitsio)
+ 
  macro_optional_find_package(USB)
  macro_log_feature(LIBUSB_FOUND "libusb" "User level access to USB devices" "http://indi.sf.net" FALSE "" "Provides support for USB based drivers in INDI.")
  
 -macro_optional_find_package(CFITSIO)
-+#macro_optional_find_package(CFITSIO)
++pkg_check_modules(CFITSIO REQUIRED cfitsio)
  macro_bool_to_01(CFITSIO_FOUND HAVE_CFITSIO_H)
  macro_log_feature(CFITSIO_FOUND "libcfitsio" "A library for reading and writing data files in FITS (Flexible Image Transport System) data format" "http://indi.sf.net" FALSE "3.03" "Provides INDI with FITS I/O support.")
  
@@ -27,10 +26,3 @@
  endif (CFITSIO_FOUND)
  
  if (NOVA_FOUND)
-@@ -521,4 +522,4 @@
- 
- install( FILES indiapi.h indidevapi.h base64.h eventloop.h ${CMAKE_SOURCE_DIR}/libs/lilxml.h
-  ${CMAKE_SOURCE_DIR}/libs/indicom.h DESTINATION ${INCLUDE_INSTALL_DIR}/libindi COMPONENT Devel)
-- 
-\ No hay ningún carácter de nueva línea al final del fichero
-+ 


Index: libindi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libindi/devel/libindi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libindi.spec	14 Feb 2009 15:53:47 -0000	1.2
+++ libindi.spec	14 Feb 2009 16:18:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name: libindi
 Version: 0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Instrument Neutral Distributed Interface
 
 Group: Development/Libraries
@@ -74,6 +74,9 @@
 %exclude %{_libdir}/*.a
 
 %changelog
+* Sat Feb 14 2009 Sergio Pascual <sergiopr at fedoraproject.org> -  0.6-4
+- Fixed patch to find cfitsio
+
 * Sat Feb 14 2009 Sergio Pascual <sergiopr at fedoraproject.org> -  0.6-3
 - Patch to detect cfitsio in all architectures