[vfrnav] update to 20130801

[sailer]

commit 64d9e58f4e2eeeb878335a0a241c8c45c1179359
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Thu Aug 1 12:55:43 2013 +0200

    update to 20130801

 .gitignore  |    1 +
 sources     |    2 +-
 vfrnav.spec |   41 ++++++++++++++++++++++++++++-------------
 3 files changed, 30 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 05e663c..725d586 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ vfrnav-0.4.tar.gz
 /vfrnav-20130510.tar.gz
 /vfrnav-20130627.tar.gz
 /vfrnav-20130723.tar.gz
+/vfrnav-20130801.tar.gz
diff --git a/sources b/sources
index f966a6e..2e24159 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0072b70d039d7d83fbca6079c6f7767a  vfrnav-20130723.tar.gz
+59dd293aad4a7efc7bc80337e3d4c438  vfrnav-20130801.tar.gz
diff --git a/vfrnav.spec b/vfrnav.spec
index 6cc7ee2..8e624a8 100644
--- a/vfrnav.spec
+++ b/vfrnav.spec
@@ -1,6 +1,6 @@
 Name:           vfrnav
-Version:        20130723
-Release:        2%{?dist}
+Version:        20130801
+Release:        1%{?dist}
 Summary:        VFR/IFR Navigation
 
 Group:          Applications/Productivity
@@ -9,7 +9,7 @@ URL:            http://www.baycom.org/~tom/vfrnav
 Source0:        http://download.gna.org/vfrnav/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%bcond_with webservice
+%bcond_without webservice
 
 BuildRequires:  gtkmm30-devel
 BuildRequires:  libxml++-devel >= 2.14.0
@@ -43,6 +43,7 @@ BuildRequires:  libcurl-devel
 BuildRequires:  webkitgtk3-devel
 BuildRequires:  openjpeg-devel
 BuildRequires:  libsoup-devel
+BuildRequires:  systemd-devel
 BuildRequires:  transfig
 BuildRequires:  texlive
 BuildRequires:  texlive-texconfig
@@ -68,7 +69,7 @@ Requires:       libreoffice-calc
 
 %if %{with webservice}
 BuildRequires:  jsoncpp-devel
-BuildRequires:  websocketpp
+BuildRequires:  sqlite
 %endif
 
 %description
@@ -89,6 +90,10 @@ for the VFR navigation application.
 Summary:        VFR Navigation CFMU Autorouter Webservice
 Group:          Applications/Productivity
 Requires:       %{name} = %{version}
+Requires:       httpd
+Requires:       php
+Requires:       php-pdo
+Requires:       php-pecl-jsonc
 
 %description webservice
 This package contains a webservice for the CFMU Autorouter.
@@ -125,13 +130,19 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/40x40/
 
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vfrnav
 
-%if %{with webservice}
-install -d $RPM_BUILD_ROOT/%{_libdir}/vfrnav
-%else
 rm -f $RPM_BUILD_ROOT/%{_sbindir}/cfmuws
 rm -f $RPM_BUILD_ROOT/lib/systemd/system/cfmuws.service
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cfmuws
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/vfrnav/cfmuwsusers.json
+
+%if %{with webservice}
+install -d $RPM_BUILD_ROOT/%{_libdir}/vfrnav
+echo "CREATE TABLE IF NOT EXISTS credentials (username TEXT UNIQUE NOT NULL, passwdclear TEXT, passwdmd5 TEXT, salt INTEGER);" | sqlite3 $RPM_BUILD_ROOT/%{_sysconfdir}/vfrnav/autoroute.db
+install -d $RPM_BUILD_ROOT/run/vfrnav
+%else
+rm -f $RPM_BUILD_ROOT/lib/systemd/system/cfmuautoroute.service
+rm -f $RPM_BUILD_ROOT/lib/systemd/system/cfmuautoroute.socket
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cfmuautoroute
 %endif
 
 %if %{with webservice}
@@ -139,7 +150,7 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/vfrnav/cfmuwsusers.json
 getent group vfrnav &>/dev/null || groupadd -r vfrnav
 getent passwd vfrnav &>/dev/null || \
 useradd -g vfrnav -d /var/lib/vfrnav -M -r -s /sbin/nologin \
-    -c "Special user account to be used by vfrnav cfmuws" vfrnav
+    -c "Special user account to be used by vfrnav cfmuautoroute web service" vfrnav
 %endif
 
 %post
@@ -242,20 +253,24 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with webservice}
 %files webservice
 %defattr(-,root,root,-)
-%{_sbindir}/cfmuws
-/lib/systemd/system/cfmuws.service
-%config(noreplace) %{_sysconfdir}/sysconfig/cfmuws
+/lib/systemd/system/cfmuautoroute.service
+/lib/systemd/system/cfmuautoroute.socket
+%config(noreplace) %{_sysconfdir}/sysconfig/cfmuautoroute
 %dir %{_sysconfdir}/vfrnav
 %dir %{_libdir}/vfrnav
-%config(noreplace) %attr(0640,vfrnav,vfrnav) %{_sysconfdir}/vfrnav/cfmuwsusers.json
+%dir %attr(0755,vfrnav,vfrnav) /run/vfrnav
+%config(noreplace) %attr(0660,vfrnav,apache) %{_sysconfdir}/vfrnav/autoroute.db
 %endif
 
 %changelog
+* Thu Aug  1 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130801-1
+- update to 20130801
+
 * Tue Jul 30 2013 Petr Machata <pmachata at redhat.com> - 20130723-2
 - Rebuild for boost 1.54.0
 
 * Tue Jul 23 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130723-1
-- update to 20130627
+- update to 20130723
 - rebuild for polyclipping
 
 * Thu Jun 27 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130627-1