[vfrnav] update to 20130723
sailer
sailer at fedoraproject.org
Mon Jul 22 23:14:52 UTC 2013
commit 718b20f04cf0aa53bcea4e83aa4cb33200f72be2
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Tue Jul 23 01:14:29 2013 +0200
update to 20130723
.gitignore | 1 +
sources | 2 +-
vfrnav-webkit.patch | 47 ------------------------------------------
vfrnav.spec | 57 ++++++++++++++++++++++++++++++++++++++++++++++++--
4 files changed, 56 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e0bd85..05e663c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ vfrnav-0.4.tar.gz
/vfrnav-20130429.tar.gz
/vfrnav-20130510.tar.gz
/vfrnav-20130627.tar.gz
+/vfrnav-20130723.tar.gz
diff --git a/sources b/sources
index 4cc5c84..f966a6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d84865ad1263690d7f3e8b60b11506e1 vfrnav-20130627.tar.gz
+0072b70d039d7d83fbca6079c6f7767a vfrnav-20130723.tar.gz
diff --git a/vfrnav.spec b/vfrnav.spec
index 8c5566e..2fa386c 100644
--- a/vfrnav.spec
+++ b/vfrnav.spec
@@ -1,5 +1,5 @@
Name: vfrnav
-Version: 20130627
+Version: 20130723
Release: 1%{?dist}
Summary: VFR/IFR Navigation
@@ -10,6 +10,8 @@ Source0: http://download.gna.org/vfrnav/%{name}-%{version}.tar.gz
Patch0: vfrnav-webkit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%bcond_with webservice
+
BuildRequires: gtkmm30-devel
BuildRequires: libxml++-devel >= 2.14.0
BuildRequires: sqlite-devel >= 3.0
@@ -26,8 +28,8 @@ BuildRequires: zfstream-devel
BuildRequires: gettext
%ifnarch s390 s390x
BuildRequires: pilot-link-devel
-BuildRequires: gnome-bluetooth-libs-devel
%endif
+BuildRequires: gnome-bluetooth-libs-devel
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
BuildRequires: geoclue-devel
@@ -65,6 +67,11 @@ Requires: gypsy
Requires: libreoffice-core
Requires: libreoffice-calc
+%if %{with webservice}
+BuildRequires: jsoncpp-devel
+BuildRequires: websocketpp
+%endif
+
%description
This is a navigation application for VFR and IFR flying.
@@ -78,9 +85,18 @@ Requires: %{name} = %{version}
This package contains utilities for database creation and manipulation
for the VFR navigation application.
+%if %{with webservice}
+%package webservice
+Summary: VFR Navigation CFMU Autorouter Webservice
+Group: Applications/Productivity
+Requires: %{name} = %{version}
+
+%description webservice
+This package contains a webservice for the CFMU Autorouter.
+%endif
+
%prep
%setup -q
-%patch0 -p0 -b .webkit
%build
%configure
@@ -108,6 +124,25 @@ convert -size 48x48 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/40x40/apps/vfrnav.
rm -rf $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/26x26/
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
+%endif
+
+%if %{with webservice}
+%pre webservice
+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
+%endif
+
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -203,8 +238,24 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/vfrdbaixmimport
%{_bindir}/vfrdbopenair
%{_bindir}/vfrdbfasimport
+%{_bindir}/vfrradconvert
+
+%if %{with webservice}
+%files webservice
+%defattr(-,root,root,-)
+%{_sbindir}/cfmuws
+/lib/systemd/system/cfmuws.service
+%config(noreplace) %{_sysconfdir}/sysconfig/cfmuws
+%dir %{_sysconfdir}/vfrnav
+%dir %{_libdir}/vfrnav
+%config(noreplace) %attr(0640,vfrnav,vfrnav) %{_sysconfdir}/vfrnav/cfmuwsusers.json
+%endif
%changelog
+* Thu Jul 23 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130723-1
+- update to 20130627
+- rebuild for polyclipping
+
* Thu Jun 27 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130627-1
- update to 20130627
- rebuild for polyclipping
More information about the scm-commits
mailing list