rpms/nightview/devel nighthttpd.sysvinit, NONE, 1.1 nightview-0.3.1-doc.patch, NONE, 1.1 nightview-0.3.2-fitslib.patch, NONE, 1.1 nightview-0.3.2-initscript.patch, NONE, 1.1 nightview.spec, NONE, 1.1 xmove.desktop, NONE, 1.1 xnightview.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Wed Jan 7 20:53:20 UTC 2009

Author: lkundrak

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

Modified Files:
	.cvsignore sources 
Added Files:
	nighthttpd.sysvinit nightview-0.3.1-doc.patch 
	nightview-0.3.2-fitslib.patch nightview-0.3.2-initscript.patch 
	nightview.spec xmove.desktop xnightview.desktop 
Log Message:
Import nightview

--- NEW FILE nighthttpd.sysvinit ---
#! /bin/bash
#
# nighthttpd: init script for nighthttpd
#
# Author: Lubomir Rintel <lkundrak at v3.sk>
# 
# chkconfig: - 96 04
# description: NightView HTTP daemon
# processname: nighthttpd
# config: /etc/sysconfig/nightview
#
### BEGIN INIT INFO
# Provides: nighthttpd
# Required-Start: network
# Required-Stop:
# Default-Start:
# Default-Stop: 0 1 2 6
# Short-Description: NightView HTTP daemon
# Description: Daemon for remote access to NightView via HTTP protocol
### END INIT INFO

SERVICE=nighthttpd
PROCESS=nighthttpd
DAEMON=/usr/sbin/nighthttpd

# Source function library.
. /etc/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Source service configuration.
[ -f /etc/sysconfig/nightview ] && . /etc/sysconfig/nightview

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

[ -x $DAEMON ] || exit 1

start() {
        echo -n $"Starting $SERVICE: "
        daemon --user nobody $DAEMON
	echo
        [ $RETVAL = 0 ] && touch /var/lock/subsys/$SERVICE
        return $RETVAL
}

stop() {
        echo -n $"Stopping $SERVICE:"
        killproc $PROCESS
	RETVAL=$?
        echo
        if [ $RETVAL -eq 0 ]; then
        	rm -f /var/lock/subsys/$SERVICE
        fi
        return $RETVAL
}

restart() {
	stop && start
}

RETVAL=0
case "$1" in
  start)
	start
	RETVAL=$?
	;;
  stop)
	stop
	RETVAL=$?
	;;
  restart)
	restart
	RETVAL=$?
	;;
  reload)
	echo "$0 does not support configuration reloading, you have to restart it."
	RETVAL=1
	;;
  status)
	status $PROCESS
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|reload|status}"
	RETVAL=1
esac

exit $RETVAL

nightview-0.3.1-doc.patch:

--- NEW FILE nightview-0.3.1-doc.patch ---
* Replace a couple of Debian specific paths with Fedora specific (*sigh*)
* Fix DOCTYPE by changing local reference to DTD into global
* Increase quality of PDF documentation by bypassing PostScript, ps2pdf

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.1/doc/hack/sample-both.dsl.doc nightview-0.3.1/doc/hack/sample-both.dsl
--- nightview-0.3.1/doc/hack/sample-both.dsl.doc	2003-05-14 18:44:19.000000000 +0200
+++ nightview-0.3.1/doc/hack/sample-both.dsl	2008-11-05 00:06:08.000000000 +0100
@@ -2,11 +2,11 @@
 <!ENTITY % html "IGNORE">
 <![%html;[
 <!ENTITY % print "IGNORE">
-<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA dsssl>
+<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl" CDATA dsssl>
 ]]>
 <!ENTITY % print "INCLUDE">
 <![%print;[
-<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/print/docbook.dsl" CDATA dsssl>
+<!ENTITY docbook.dsl SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets/print/docbook.dsl" CDATA dsssl>
 ]]>
 <!ENTITY htmlmath.dsl SYSTEM "HTMLMath.dsl">
 <!ENTITY texmath.dsl SYSTEM "TeXMath.dsl">
diff -up nightview-0.3.1/doc/Makefile.nightview.doc nightview-0.3.1/doc/Makefile.nightview
--- nightview-0.3.1/doc/Makefile.nightview.doc	2003-09-23 16:41:50.000000000 +0200
+++ nightview-0.3.1/doc/Makefile.nightview	2008-11-05 00:13:32.000000000 +0100
@@ -11,14 +11,14 @@ JADEHTML = 1
 XSLTPROC= xsltproc
 #
 #  XSLT-stylesheet
-HTMLSHIT= /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl
+HTMLSHIT=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl 
 #
 # DSSSL stylesheet
 DSLSHIT= /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/print/docbook.dsl
 DSLSHIT= hack/sample-both.dsl
 #
 # XML declaration
-XMLDEC= /usr/lib/sgml/declaration/xml.decl
+XMLDEC= /usr/share/sgml/docbook/dsssl-stylesheets/dtds/decls/xml.dcl
 #
 JADE=jade    # JADE = [ jade | openjade ]
 #
@@ -38,8 +38,8 @@ nightview.ps: nightview.dvi
 #; rm -f *.dvi *.aux *.log;
 
 # pdf version
-nightview.pdf: nightview.ps
-	ps2pdf nightview.ps nightview.pdf
+nightview.pdf: nightview.dvi
+	dvipdf nightview.dvi nightview.pdf
 
 # pdf version
 #
diff -up nightview-0.3.1/doc/nightview.xml.doc nightview-0.3.1/doc/nightview.xml
--- nightview-0.3.1/doc/nightview.xml.doc	2004-12-24 17:29:37.000000000 +0100
+++ nightview-0.3.1/doc/nightview.xml	2008-11-05 00:06:08.000000000 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="nightview.css" type="text/css"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2CR1//EN" "/usr/share/sgml/docbook/dtd/xml/4.2.cr1/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY latex "LaTeX">
 <!ENTITY tex "TeX">
 ]>

nightview-0.3.2-fitslib.patch:

--- NEW FILE nightview-0.3.2-fitslib.patch ---
Our convention is to put application-specific headers into a
separate subdirectory.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.2/gtknightview/fits.c.fitslib nightview-0.3.2/gtknightview/fits.c
--- nightview-0.3.2/gtknightview/fits.c.fitslib	2002-07-16 17:08:29.000000000 +0200
+++ nightview-0.3.2/gtknightview/fits.c	2009-01-06 10:40:06.000000000 +0100
@@ -9,7 +9,7 @@
 #include "fitsadd.h"
 #include "gtknightview.h"
 #include "string.h"
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <sys/stat.h>
 
 #define FWHM_BOX 5
diff -up nightview-0.3.2/lib/fitsadd.c.fitslib nightview-0.3.2/lib/fitsadd.c
--- nightview-0.3.2/lib/fitsadd.c.fitslib	2003-06-25 15:49:00.000000000 +0200
+++ nightview-0.3.2/lib/fitsadd.c	2009-01-06 10:40:06.000000000 +0100
@@ -1,7 +1,7 @@
 
 #include "fitsadd.h"
 #include <sys/stat.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <unistd.h>
 #include <string.h>
 
diff -up nightview-0.3.2/libsbig/ccdfits.c.fitslib nightview-0.3.2/libsbig/ccdfits.c
--- nightview-0.3.2/libsbig/ccdfits.c.fitslib	2007-06-16 13:36:04.000000000 +0200
+++ nightview-0.3.2/libsbig/ccdfits.c	2009-01-06 10:40:06.000000000 +0100
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include "nightview.h"
 #include "ccdtypes.h"
 #include "ccdcommon.h"
diff -up nightview-0.3.2/libsbig/ccdsbig.c.fitslib nightview-0.3.2/libsbig/ccdsbig.c
--- nightview-0.3.2/libsbig/ccdsbig.c.fitslib	2007-05-07 20:36:48.000000000 +0200
+++ nightview-0.3.2/libsbig/ccdsbig.c	2009-01-06 10:40:06.000000000 +0100
@@ -25,7 +25,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <syslog.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <sbig.h>
 #include "nightview.h"
 #include "ccdtypes.h"
diff -up nightview-0.3.2/libsbig/systime.c.fitslib nightview-0.3.2/libsbig/systime.c
--- nightview-0.3.2/libsbig/systime.c.fitslib	2007-05-07 20:36:48.000000000 +0200
+++ nightview-0.3.2/libsbig/systime.c	2009-01-06 10:40:06.000000000 +0100
@@ -11,7 +11,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <syslog.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 #include <string.h>
 
 
diff -up nightview-0.3.2/shell/night_pointer.cpp.fitslib nightview-0.3.2/shell/night_pointer.cpp
--- nightview-0.3.2/shell/night_pointer.cpp.fitslib	2008-10-29 23:04:07.000000000 +0100
+++ nightview-0.3.2/shell/night_pointer.cpp	2009-01-06 10:40:06.000000000 +0100
@@ -15,7 +15,7 @@
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 
 
 using namespace std;
diff -up nightview-0.3.2/xnightview/fits.cpp.fitslib nightview-0.3.2/xnightview/fits.cpp
--- nightview-0.3.2/xnightview/fits.cpp.fitslib	2008-02-13 00:04:24.000000000 +0100
+++ nightview-0.3.2/xnightview/fits.cpp	2009-01-06 10:40:06.000000000 +0100
@@ -10,7 +10,7 @@
 
 #include "xnightview.h"
 #include <math.h>
-#include <fitsio.h>
+#include <cfitsio/fitsio.h>
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"

nightview-0.3.2-initscript.patch:

--- NEW FILE nightview-0.3.2-initscript.patch ---
Most important part of this is not to enable the service by default.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -up nightview-0.3.2/rpm/mount-server.init.redhat.initscript nightview-0.3.2/rpm/mount-server.init.redhat
--- nightview-0.3.2/rpm/mount-server.init.redhat.initscript	2003-06-20 22:05:43.000000000 +0200
+++ nightview-0.3.2/rpm/mount-server.init.redhat	2009-01-06 10:40:06.000000000 +0100
@@ -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,16 @@
 #
 # $Id: mount-server.init.redhat,v 1.2 2003-06-20 20:05:43 hroch Exp $
 #
+### 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
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 # source function library
 . /etc/init.d/functions


--- NEW FILE nightview.spec ---
Name:           nightview
Version:        0.3.2
Release:        1%{?dist}
Summary:        A general astronomical software package to control of a CCD camera

Group:          Amusements/Graphics
License:        GPLv2
URL:            http://www.physics.muni.cz/mb/nightview/
Source0:        ftp://integral.physics.muni.cz/pub/nightview/%{name}-%{version}.tar.gz
Source1:        xnightview.desktop
Source2:        xmove.desktop
Source3:        nighthttpd.sysvinit
Patch0:         nightview-0.3.2-fitslib.patch
Patch1:         nightview-0.3.2-initscript.patch
Patch2:         nightview-0.3.1-doc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cfitsio-devel
BuildRequires:  wxGTK-devel
BuildRequires:  curl-devel
BuildRequires:  ImageMagick
BuildRequires:  jadetex
BuildRequires:  /usr/bin/dvipdf
BuildRequires:  docbook-style-dsssl
BuildRequires:  docbook-dtd42-xml
BuildRequires:  transfig
BuildRequires:  desktop-file-utils

Requires:       nightview-server = %{version}
Requires:       nightview-cli = %{version}
Requires:       nightview-gui = %{version}
Requires:       nightview-doc = %{version}

%description
Nightview is a general astronomical software package to control of a CCD
camera together with a telescope. It provides an intuitive graphical
interface for getting of individual exposures and a telescope possitioning.
An advanced command line interface is also offered to support of a scripting
and a long time serie imaging.

Nightview is designed as a fully network transparent providing maximum
flexibility of its usage. Moreover, all components are prepared with
possibility to be simply superseded by an user's equivalent for support of
individual improvements and possible requested extendings. 


%package server
Summary:        Server-side tools from NightView suite
Group:          Amusements/Graphics

Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts

%description server
Server tools from NightView suite.
See description of "nightview" package for more details.


%package cli
Summary:        Non-GUI tools from NightView suite
Group:          Amusements/Graphics

%description cli
Text based tools from NightView suite.
See description of "nightview" package for more details.


%package gui
Summary:        GUI tools from NightView suite
Group:          Amusements/Graphics

%description gui
Graphically oriented tools from NightView suite.
See description of "nightview" package for more details.


%package doc
Summary:        Documentation for NightView suite
Group:          Amusements/Graphics

%description doc
Documentation files for NightView suite in PDF, PostScript and HTML.
See description of "nightview" package for more details.


%prep
%setup -q
%patch0 -p1 -b .fitslib
%patch1 -p1 -b .initscript
%patch2 -p1 -b .doc

# Hack around #478680
sed "s,http://www.oasis-open.org/docbook/xml/4.2,$(
        cd /usr/share/sgml
        ls -d docbook/xml-dtd-4.2-* |head -n1
)," -i doc/nightview.xml


%build
# configure.in has a typo, patching it would need regeneration of configure
# Real fix is s/ac_cv_header_curl_h/ac_cv_header_curl_curl_h/
export ac_cv_header_curl_h=yes
# Unfortunately *sad panda* SBIG protocols are not open
%configure --without-sbigudrv --disable-static --with-curl
# configure overrides CFLAGS to a value that does not make much sense
make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"

# Build documentation (not _smp_mflags safe)
make -C doc

# Create Icon Theme Specification compilant icons
convert xnightview/xnightview-icon.xpm xnightview.png
convert xmove/xmove-icon.xpm xmove.png


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Directory structure
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/applications
install -d $RPM_BUILD_ROOT%{_docdir}/nightview-doc
install -d $RPM_BUILD_ROOT%{_initrddir}

# Icons and menu entries
install -pm 0644 xnightview.png xmove.png \
        $RPM_BUILD_ROOT%{_datadir}/pixmaps
desktop-file-install --vendor=fedora %{SOURCE1} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor=fedora %{SOURCE2} \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications

# Init scripts
install -pm 0755 rpm/mount-server.init.redhat \
        $RPM_BUILD_ROOT%{_initrddir}/telescoped
install -pm 0755 %{SOURCE3} \
        $RPM_BUILD_ROOT%{_initrddir}/nighthttpd

# Documentation
make -f Makefile.nightview -C doc install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post server
/sbin/chkconfig --add telescoped
/sbin/chkconfig --add nighthttpd


%preun server
if [ $1 = 0 ]
then
        /sbin/service telescoped stop >/dev/null 2>&1
        /sbin/chkconfig --del telescoped
        /sbin/service nighthttpd stop >/dev/null 2>&1
        /sbin/chkconfig --del nighthttpd
fi


%post cli -p /sbin/ldconfig
%postun cli -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
# Nothing external links against this so far, and this saves us
# from overhead of creating a useless devel package.
%exclude %{_libdir}/libccdnet.so
%exclude %{_libdir}/libccdnet.la
# This seems usless in a package
%exclude %{_sbindir}/nighthttpd_setup.sh
%exclude %{_sbindir}/telescoped_setup.sh
%exclude %{_bindir}/nightview-test
%exclude %{_mandir}/man1/nightview-test.1*
%doc COPYING


%files server
%defattr(-,root,root,-)
%{_initrddir}/nighthttpd
%{_initrddir}/telescoped
%{_sbindir}/nighthttpd
%{_sbindir}/telescoped
%{_mandir}/man8/nighthttpd.8*
%{_mandir}/man8/telescoped.8*
%doc COPYING


%files cli
%defattr(-,root,root,-)
%{_bindir}/night_batch
%{_bindir}/night_control
%{_bindir}/night_dark
%{_bindir}/night_darks
%{_bindir}/night_exposure
%{_bindir}/night_filter
%{_bindir}/night_flats
%{_bindir}/night_keylist
%{_bindir}/night_pointer
%{_bindir}/night_power
%{_bindir}/night_temperature
%{_bindir}/telescope
%{_libdir}/libccdnet.so.0
%{_libdir}/libccdnet.so.0.0.0
%{_mandir}/man1/night_batch.1*
%{_mandir}/man1/night_control.1*
%{_mandir}/man1/night_dark.1*
%{_mandir}/man1/night_darks.1*
%{_mandir}/man1/night_exposure.1*
%{_mandir}/man1/night_filter.1*
%{_mandir}/man1/night_flats.1*
%{_mandir}/man1/night_keylist.1*
%{_mandir}/man1/night_power.1*
%{_mandir}/man1/night_temperature.1*
%{_mandir}/man1/telescope.1*
%doc COPYING


%files gui
%defattr(-,root,root,-)
%{_bindir}/xnightview
%{_bindir}/xmove
%{_mandir}/man1/xmove.1*
%{_mandir}/man1/xnightview.1*
%{_datadir}/pixmaps
%{_datadir}/applications
%doc COPYING


%files doc
%defattr(-,root,root,-)
%dir %{_docdir}/nightview-doc
%{_docdir}/nightview-doc/html
%{_docdir}/nightview-doc/nightview.pdf
%{_docdir}/nightview-doc/nightview.ps
# Do not include sources
%exclude %{_docdir}/nightview-doc/*.fig
%exclude %{_docdir}/nightview-doc/*.eps
%exclude %{_docdir}/nightview-doc/*.jpg
%exclude %{_docdir}/nightview-doc/*.png
%exclude %{_docdir}/nightview-doc/*.css
%exclude %{_docdir}/nightview-doc/*.xml
%doc COPYING


%changelog
* Tue Jan 06 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.2-3
- Bump to 0.3.2

* Mon Jan 05 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-3
- Work around (#478680)

* Wed Nov 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-2
- Fixes for problems found during review by Marek Mahut

* Sun Oct 26 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.1-1
- Initial packaging attempt


--- NEW FILE xmove.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=XMove
Comment=Tool for moving a telescope from NightView suite
GenericName=Move Telescope
Exec=xmove %f
Icon=xmove
Categories=Graphics;Education;
Terminal=false


--- NEW FILE xnightview.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=NightView
Comment=Tool for working with pictures from SBIG cameras
GenericName=NightView
Exec=xnightview %f
Icon=xnightview
Categories=Graphics;Education;
Terminal=false


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nightview/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2009 00:11:44 -0000	1.1
+++ .cvsignore	7 Jan 2009 20:52:49 -0000	1.2
@@ -0,0 +1 @@
+nightview-0.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nightview/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2009 00:11:44 -0000	1.1
+++ sources	7 Jan 2009 20:52:49 -0000	1.2
@@ -0,0 +1 @@
+4644a08d2a75ca9ec58ff659519b0a93  nightview-0.3.2.tar.gz


