rpms/libindi/F-9 libindi-cfitsio.patch, NONE, 1.1 libindi.spec, 1.1, 1.2

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/libindi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18890

Modified Files:
	libindi.spec 
Added Files:
	libindi-cfitsio.patch 
Log Message:
* Tue Feb 17 2009 Sergio Pascual <sergiopr at fedoraproject.org> -  0.6-3
- Need to provide the static library libindidriver.a to build indi-apogee
- Patch to detect cfitsio in all architectures


libindi-cfitsio.patch:

--- NEW FILE libindi-cfitsio.patch ---
diff -ur libindi0-0.6/CMakeLists.txt libindi0-0.6.new/CMakeLists.txt
--- 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)
 include (CheckIncludeFiles)
+include (FindPkgConfig)
 
 find_package(ZLIB REQUIRED)
 
 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)
+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.")
 
@@ -45,7 +46,7 @@
 include_directories( ${CMAKE_SOURCE_DIR}/libs/webcam)
 
 if (CFITSIO_FOUND)
-  include_directories(${CFITSIO_INCLUDE_DIR})
+  include_directories(${CFITSIO_INCLUDE_DIRS})
 endif (CFITSIO_FOUND)
 
 if (NOVA_FOUND)


Index: libindi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libindi/F-9/libindi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libindi.spec	9 Feb 2009 16:28:36 -0000	1.1
+++ libindi.spec	17 Feb 2009 14:36:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name: libindi
 Version: 0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Instrument Neutral Distributed Interface
 
 Group: Development/Libraries
@@ -19,6 +19,8 @@
 
 Source0: http://downloads.sourceforge.net/indi/%{name}%{majorver}_%{version}.tar.gz
 Patch0: libindi-suffix.patch
+# https://sourceforge.net/tracker2/?func=detail&aid=2599980&group_id=90275&atid=593019
+Patch1: libindi-cfitsio.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cmake cfitsio-devel zlib-devel libnova-devel libfli-devel
@@ -34,12 +36,14 @@
 Summary: Libraries, includes, etc. used to develop an application with %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Provides: indi-static = %{version}-%{release}
 %description devel
 These are the header files needed to develop a %{name} application
 
 %prep
 %setup -q -n %{name}%{majorver}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %cmake
@@ -68,9 +72,13 @@
 %doc README COPYING.LIB LICENSE
 %{_includedir}/*
 %{_libdir}/*.so
-%exclude %{_libdir}/*.a
+%{_libdir}/*.a
 
 %changelog
+* Tue Feb 17 2009 Sergio Pascual <sergiopr at fedoraproject.org> -  0.6-3
+- Need to provide the static library libindidriver.a to build indi-apogee
+- Patch to detect cfitsio in all architectures
+
 * Fri Feb 06 2009 Sergio Pascual <sergiopr at fedoraproject.org> -  0.6-2
 - Commands (rm, make) instead of macros
 - Upstream bug about licenses (GPLv2 missing)