[libindi/el6/master] Pull from master

[Lubomir Rintel]

commit 18346e349b2b56c65b571cdde6e2f2616695bcca
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Tue Aug 3 21:27:20 2010 +0200

    Pull from master

 libindi-dso.patch |   12 ++++++++++++
 libindi.spec      |   31 ++++++++++++++++++++++++++-----
 2 files changed, 38 insertions(+), 5 deletions(-)
---
diff --git a/libindi-dso.patch b/libindi-dso.patch
new file mode 100644
index 0000000..eb7a017
--- /dev/null
+++ b/libindi-dso.patch
@@ -0,0 +1,12 @@
+diff -ur libindi0-0.6/CMakeLists.txt libindi0-0.6.new/CMakeLists.txt
+--- libindi0-0.6/CMakeLists.txt	2010-02-17 15:27:52.000000000 +0100
++++ libindi0-0.6.new/CMakeLists.txt	2010-02-17 15:28:28.000000000 +0100
+@@ -379,7 +379,7 @@
+ 
+ add_executable(indi_sbig_stv ${stv_SRCS} ${liblilxml_SRCS} ${libindicom_SRCS})
+ 
+-target_link_libraries(indi_sbig_stv z ${NOVA_LIBRARIES} ${CFITSIO_LIBRARIES})
++target_link_libraries(indi_sbig_stv m z ${NOVA_LIBRARIES} ${CFITSIO_LIBRARIES})
+ 
+ install(TARGETS indi_sbig_stv RUNTIME DESTINATION bin )
+ 
diff --git a/libindi.spec b/libindi.spec
index 0a0e1dc..63d5061 100644
--- a/libindi.spec
+++ b/libindi.spec
@@ -1,6 +1,6 @@
 Name: libindi
 Version: 0.6
-Release: 8%{?dist}
+Release: 11%{?dist}
 Summary: Instrument Neutral Distributed Interface
 
 Group: Development/Libraries
@@ -21,6 +21,9 @@ Source0: http://downloads.sourceforge.net/indi/%{name}%{majorver}_%{version}.tar
 Patch0: libindi-suffix.patch
 # https://sourceforge.net/tracker2/?func=detail&aid=2599980&group_id=90275&atid=593019
 Patch1: libindi-cfitsio.patch
+# https://sourceforge.net/tracker/?func=detail&aid=2953556&group_id=90275&atid=593019
+Patch2: libindi-dso.patch
+
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: cmake cfitsio-devel zlib-devel libnova-devel libfli-devel
@@ -36,25 +39,32 @@ data acquisition, monitoring, and a lot more.
 Summary: Libraries, includes, etc. used to develop an application with %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Provides: libindi-static = %{version}-%{release}
 %description devel
 These are the header files needed to develop a %{name} application
 
+%package static
+Summary: Static libraries, includes, etc. used to develop an application with %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description static
+Static library needed to develop a %{name} application
+
 %prep
 %setup -q -n %{name}%{majorver}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %cmake
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
-rm -fr %{buildroot}
+rm -rf %{buildroot}
 make install  DESTDIR=%{buildroot}
 
 %clean
-rm -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -69,12 +79,23 @@ rm -fr %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc README COPYING.LIB LICENSE
 %{_includedir}/*
 %{_libdir}/*.so
+
+%files static
+%defattr(-,root,root,-)
 %{_libdir}/*.a
 
 %changelog
+* Wed Feb 17 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 0.6-11
+- Added missing -lm in indi_sbig_stv. Fixes bz #564842
+
+* Fri Jan 08 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 0.6-10
+- EVR bump, rebuilt with new libnova
+
+* Tue Dec 22 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 0.6-9
+- Static library moved to its own subpackage
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild