From c69512cbf18563a586a456e00847dc929afb6301 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Feb 23 2016 08:34:06 +0000
Subject: Drop geoclue-1 (need to migrate to geoclue-2, v1 has numerous security issues) and gypsy support (dead upstream, security issues), spec cleanups, use %%licence


---

diff --git a/vfrnav.spec b/vfrnav.spec
index 3682a77..f7f9a82 100644
--- a/vfrnav.spec
+++ b/vfrnav.spec
@@ -1,13 +1,12 @@
 Name:           vfrnav
 Version:        20150429
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        VFR/IFR Navigation
 
 Group:          Applications/Productivity
 License:        GPLv2+
 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_without webservice
 
@@ -17,7 +16,6 @@ BuildRequires:  sqlite-devel >= 3.0
 BuildRequires:  gpsd-devel
 BuildRequires:  libsqlite3x-devel
 BuildRequires:  gdal-devel
-BuildRequires:  gypsy-devel
 BuildRequires:  bluez-libs-devel
 BuildRequires:  eigen3-devel
 BuildRequires:  boost-devel
@@ -32,7 +30,6 @@ BuildRequires:  pilot-link-devel
 BuildRequires:  gnome-bluetooth-libs-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  ImageMagick
-BuildRequires:  geoclue-devel
 BuildRequires:  gsl-devel
 BuildRequires:  libftdi-devel
 BuildRequires:  libftdi-c++-devel
@@ -183,7 +180,6 @@ This package contains a webservice for the CFMU Autorouter.
 %setup -q
 
 %build
-#configure --disable-gtk3
 CXXFLAGS=`echo %optflags -std=c++11 | sed -e 's/-O2//'`
 export CXXFLAGS
 CFLAGS=`echo %optflags | sed -e 's/-O2//'`
@@ -192,7 +188,6 @@ export CFLAGS
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 for i in $RPM_BUILD_ROOT/%{_datadir}/applications/*.desktop; do
@@ -259,12 +254,11 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO doc/flightdeck.pdf
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc AUTHORS ChangeLog INSTALL NEWS README TODO doc/flightdeck.pdf
 %{_datadir}/applications/vfrnav.desktop
 %{_datadir}/applications/flightdeck.desktop
 %{_datadir}/applications/vfrairporteditor.desktop
@@ -324,7 +318,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/navlog.xml
 
 %files utils
-%defattr(-,root,root,-)
 %{_bindir}/vfrdbdafif
 %{_bindir}/vfrdbmapelementsdb
 %{_bindir}/vfrdboptimizelabelplacement
@@ -356,14 +349,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/weatherfplan
 
 %files wetterdl
-%defattr(-,root,root,-)
 %{_bindir}/wetterdl.py
 %{_datadir}/applications/wetterdl.desktop
 %{_datadir}/icons/hicolor/32x32/apps/wetterdl.png
 %{_datadir}/icons/hicolor/48x48/apps/wetterdl.png
 
 %files validatorservice
-%defattr(-,root,root,-)
 /lib/systemd/system/cfmuvalidate.service
 /lib/systemd/system/cfmuvalidate.socket
 %config(noreplace) %{_sysconfdir}/sysconfig/cfmuvalidate
@@ -373,7 +364,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with webservice}
 %files webservice
-%defattr(-,root,root,-)
 /lib/systemd/system/cfmuautoroute.service
 /lib/systemd/system/cfmuautoroute.socket
 %config(noreplace) %{_sysconfdir}/sysconfig/cfmuautoroute
@@ -383,7 +373,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 20150429-3
+* Tue Feb 23 2016 Peter Robinson <pbrobinson@fedoraproject.org> 20150429-3
+- Drop geoclue-1 and gypsy support
+- Use %%licence
+- Minor spec cleanups
+
+* Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 20150429-2
 - Rebuild for gsl 2.1
 
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 20150429-2