[nightview] Fix FTBFS.

[Jon Ciesla]

commit 9b2b525212f628c895281e07b4ca22a58b6b8bef
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Mar 6 10:38:22 2012 -0600

    Fix FTBFS.

 nightview-0.3.3-curl.patch       |   10 ++++++++++
 nightview-0.3.3-initscript.patch |   28 ++++++++++++++++++++++++++++
 nightview-0.3.3-unistd.patch     |   30 ++++++++++++++++++++++++++++++
 nightview.spec                   |   12 +++++++++---
 4 files changed, 77 insertions(+), 3 deletions(-)
---
diff --git a/nightview-0.3.3-curl.patch b/nightview-0.3.3-curl.patch
new file mode 100644
index 0000000..5b68bf1
--- /dev/null
+++ b/nightview-0.3.3-curl.patch
@@ -0,0 +1,10 @@
+--- nightview-0.3.3/lib/httpsub.c~	2006-12-03 17:04:51.000000000 -0600
++++ nightview-0.3.3/lib/httpsub.c	2012-03-06 09:42:42.081967461 -0600
+@@ -11,7 +11,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #ifdef DEBUG
diff --git a/nightview-0.3.3-initscript.patch b/nightview-0.3.3-initscript.patch
new file mode 100644
index 0000000..28d9986
--- /dev/null
+++ b/nightview-0.3.3-initscript.patch
@@ -0,0 +1,28 @@
+--- nightview-0.3.3/rpm/mount-server.init.redhat~	2003-06-20 15:05:43.000000000 -0500
++++ nightview-0.3.3/rpm/mount-server.init.redhat	2012-03-06 09:37:54.784398089 -0600
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ #
+-# chkconfig: 2345 96 04
++# chkconfig: - 96 04
+ # description: mount server
+ # processname: telescoped
+ # pidfile: /var/run/telescoped.pid
+@@ -8,8 +8,15 @@
+ #
+ # $Id: mount-server.init.redhat,v 1.2 2003-06-20 20:05:43 hroch Exp $
+ #
+-
+-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
++### BEGIN INIT INFO
++# Provides: telescoped
++# Required-Start: network
++# Required-Stop:
++# Default-Start:
++# Default-Stop: 0 1 2 6
++# Short-Description: Telescope mount server
++# Description: Remote control for telescope from NightView suite
++### END INIT INFO
+ 
+ # source function library
+ . /etc/init.d/functions
diff --git a/nightview-0.3.3-unistd.patch b/nightview-0.3.3-unistd.patch
new file mode 100644
index 0000000..bd447e1
--- /dev/null
+++ b/nightview-0.3.3-unistd.patch
@@ -0,0 +1,30 @@
+--- nightview-0.3.3/httpdaemon/httpserver.cpp~	2008-10-29 17:03:25.000000000 -0500
++++ nightview-0.3.3/httpdaemon/httpserver.cpp	2012-03-06 10:02:45.907350434 -0600
+@@ -18,6 +18,7 @@
+ #include <cstdlib>
+ #include <errno.h>
+ #include <syslog.h>
++#include <unistd.h>
+ 
+ /* system wide rc file name */
+ //#define SYSTEMRC "/usr/local/etc/nightviewd.conf"
+--- nightview-0.3.3/httpdaemon/http.cpp~	2007-08-28 13:57:59.000000000 -0500
++++ nightview-0.3.3/httpdaemon/http.cpp	2012-03-06 10:15:12.525743591 -0600
+@@ -11,6 +11,7 @@
+ #include "http.h"
+ //#include <stdexcept>
+ #include <cstring>
++#include <unistd.h>
+ 
+ #ifdef DEBUG
+ #include <iostream>
+--- nightview-0.3.3/httpdaemon/http.h~	2006-12-30 15:15:47.000000000 -0600
++++ nightview-0.3.3/httpdaemon/http.h	2012-03-06 10:29:07.574203946 -0600
+@@ -10,6 +10,7 @@
+ #include <string>
+ #include <vector>
+ #include <stdexcept>
++#include <unistd.h>
+ 
+ class Logger {
+  public:
diff --git a/nightview.spec b/nightview.spec
index e6e602a..7f4d42c 100644
--- a/nightview.spec
+++ b/nightview.spec
@@ -1,6 +1,6 @@
 Name:           nightview
 Version:        0.3.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A general astronomical software package to control of a CCD camera
 
 Group:          Amusements/Graphics
@@ -11,8 +11,10 @@ Source1:        xnightview.desktop
 Source2:        xmove.desktop
 Source3:        nighthttpd.sysvinit
 Patch0:         nightview-0.3.2-fitslib.patch
-Patch1:         nightview-0.3.2-initscript.patch
+Patch1:         nightview-0.3.3-initscript.patch
 Patch2:         nightview-0.3.1-doc.patch
+Patch3:		nightview-0.3.3-curl.patch
+Patch4:		nightview-0.3.3-unistd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cfitsio-devel
@@ -89,7 +91,8 @@ See description of "nightview" package for more details.
 %patch0 -p1 -b .fitslib
 %patch1 -p1 -b .initscript
 %patch2 -p1 -b .doc
-
+%patch3 -p1 -b .curl
+%patch4 -p1 -b .unistd
 
 %build
 # configure.in has a typo, patching it would need regeneration of configure
@@ -242,6 +245,9 @@ fi
 
 
 %changelog
+* Tue Mar 06 2012 Jon Ciesla <limburgher at gmail.com> - 0.3.3-6
+- Fix FTBFS.
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-5
 - Rebuilt for c++ ABI breakage