[libindi] New upstream source All instruments created (solves #653690) Library does not call exit() Library do

Tue Jan 24 23:10:17 UTC 2012

commit a80fa6d81376b7e405706b0bc14d2140ab52fb18
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Wed Jan 25 00:10:27 2012 +0100

    New upstream source
    All instruments created (solves #653690)
    Library does not call exit()
    Library does not build require boost-devel

 .gitignore            |    1 +
 libindi-cfitsio.patch |   28 ----------------------------
 libindi-fsf.patch     |   12 ++++++++++++
 libindi-suffix.patch  |   37 -------------------------------------
 libindi-usleep.patch  |   11 +++++++++++
 libindi.spec          |   43 ++++++++++++++++++-------------------------
 sources               |    2 +-
 7 files changed, 43 insertions(+), 91 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 6ad71c5..218cc79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 libindi0_0.6.tar.gz
 /libindi_0.6.2.tar.gz
 /libindi_0.8.tar.gz
+/libindi_0.9.tar.gz
diff --git a/libindi-fsf.patch b/libindi-fsf.patch
new file mode 100644
index 0000000..64faeeb
--- /dev/null
+++ b/libindi-fsf.patch
@@ -0,0 +1,12 @@
+diff -ur libindi-0.9/libs/lilxml.c libindi-0.9.new/libs/lilxml.c
+--- libindi-0.9/libs/lilxml.c	2012-01-13 19:40:07.000000000 +0100
++++ libindi-0.9.new/libs/lilxml.c	2012-01-25 00:04:47.486466181 +0100
+@@ -14,7 +14,7 @@
+ 
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+ #endif
+ 
diff --git a/libindi-usleep.patch b/libindi-usleep.patch
new file mode 100644
index 0000000..f9e440a
--- /dev/null
+++ b/libindi-usleep.patch
@@ -0,0 +1,11 @@
+diff -ur libindi-0.9/drivers/focuser/robofocus.cpp libindi-0.9.new/drivers/focuser/robofocus.cpp
+--- libindi-0.9/drivers/focuser/robofocus.cpp	2012-01-13 19:40:06.000000000 +0100
++++ libindi-0.9.new/drivers/focuser/robofocus.cpp	2012-01-24 23:34:02.814667216 +0100
+@@ -25,6 +25,7 @@
+ #include <termios.h>
+ #include <string.h>
+ #include <sys/time.h>
++#include <unistd.h>
+ 
+ #define RF_MAX_CMD   9
+ #define RF_TIMEOUT   15
diff --git a/libindi.spec b/libindi.spec
index 9783601..d7d6b20 100644
--- a/libindi.spec
+++ b/libindi.spec
@@ -1,28 +1,22 @@
 Name: libindi
-Version: 0.8
-Release: 2%{?dist}
+Version: 0.9
+Release: 1%{?dist}
 Summary: Instrument Neutral Distributed Interface
 
 Group: Development/Libraries
 License: LGPLv2+ and GPLv2+
-# The code is LGPLv2+ except:
-# some files for v4l2 conversion under libs/webcam are GPLv2+
-# drivers/video/stvdriver (indi_stv driver) appears to contain GPL code
-# upstream bug https://sourceforge.net/tracker2/?func=detail&aid=2572902&group_id=90275&atid=593019
-
-# rpmlint warning libindi call exit
-# upstream bug https://sourceforge.net/tracker2/?func=detail&aid=2572863&group_id=90275&atid=593019
+# See COPYRIGHT file for a description of the licenses and files covered
 
 # Address of FSF is incorrect
 # upstream bug https://sourceforge.net/tracker/?func=detail&aid=3367995&group_id=90275&atid=593019
 
 URL: http://www.indilib.org
-
 Source0: http://downloads.sourceforge.net/indi/%{name}_%{version}.tar.gz
-Patch0: libindi-suffix.patch
+Patch0: libindi-usleep.patch
+Patch1: libindi-fsf.patch
 
 BuildRequires: cmake cfitsio-devel zlib-devel libnova-devel libfli-devel
-BuildRequires: boost-devel libusb-devel
+BuildRequires: libusb-devel
 
 %description
 INDI is a distributed control protocol designed to operate
@@ -30,7 +24,6 @@ astronomical instrumentation. INDI is small, flexible, easy to parse,
 and scalable. It supports common DCS functions such as remote control,
 data acquisition, monitoring, and a lot more.
 
-
 %package devel
 Summary: Libraries, includes, etc. used to develop an application with %{name}
 Group: Development/Libraries
@@ -48,6 +41,10 @@ Static library needed to develop a %{name} application
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
+chmod -x drivers/telescope/lx200fs2.h
+chmod -x drivers/telescope/lx200fs2.cpp
+
 
 %build
 %cmake
@@ -57,23 +54,12 @@ make VERBOSE=1 %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-# Adding manually links missing as in bz #653690
-pushd %{buildroot}/%{_bindir}
-for i in indi_lx200classic indi_lx200autostar indi_lx200_16 \
-    indi_lx200gps indi_lx200ap; do
-         ln -s indi_lx200generic $i
-done
-popd
-
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS ChangeLog COPYING.LIB LICENSE README README.drivers
+%doc AUTHORS ChangeLog COPYING.GPL COPYING.LGPL COPYRIGHT LICENSE NEWS README README.drivers TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_datadir}/indi
@@ -87,6 +73,12 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Tue Jan 24 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9-1
+- New upstream source
+- All instruments created (solves #653690)
+- Library does not call exit()
+- Library does not build require boost-devel
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
@@ -139,3 +131,4 @@ rm -rf %{buildroot}
 
 * Mon Jan 28 2009 Sergio Pascual <sergiopr at fedoraproject.org> -  0.6-1
 - First version
+
diff --git a/sources b/sources
index cff73ab..4269c46 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca2b7c56431eb5e08218929e5eb72150  libindi_0.8.tar.gz
+364a13c26f118fdc8e3eff9b36b041db  libindi_0.9.tar.gz
