From 69734d0f3105f82955d7eec0926e4a9a0c60b980 Mon Sep 17 00:00:00 2001
From: Thomas Sailer <t.sailer@alumni.ethz.ch>
Date: Dec 01 2012 13:50:21 +0000
Subject: Merge branch 'master' into f18


Conflicts:
	vfrnav.spec

---

diff --git a/.gitignore b/.gitignore
index 580797d..acc501a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ vfrnav-0.4.tar.gz
 /vfrnav-20120810.tar.gz
 /vfrnav-20120815.tar.gz
 /vfrnav-20120831.tar.gz
+/vfrnav-20121111.tar.gz
diff --git a/sources b/sources
index 7e06b76..aeec273 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d6707892a1447d242aae868475b75af  vfrnav-20120831.tar.gz
+3c93073e37be1e5d6a78ac73a2c11db7  vfrnav-20121111.tar.gz
diff --git a/vfrnav.spec b/vfrnav.spec
index 262f3e3..e517121 100644
--- a/vfrnav.spec
+++ b/vfrnav.spec
@@ -1,5 +1,5 @@
 Name:           vfrnav
-Version:        20120831
+Version:        20121111
 Release:        1%{?dist}
 Summary:        VFR/IFR Navigation
 
@@ -43,6 +43,9 @@ BuildRequires:  transfig
 BuildRequires:  texlive-latex
 BuildRequires:  poppler-utils
 BuildRequires:  readline-devel
+BuildRequires:  geos-devel
+BuildRequires:  polyclipping-devel
+BuildRequires:  octave
 Requires:       gypsy
 
 %description
@@ -139,6 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/flightdeck
 %{_bindir}/cfmuvalidate
 %{_bindir}/cfmuautoroute
+%{_bindir}/checkfplan
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/cfmuvalidateserver
 %{_datadir}/%{name}/flightdeck.ui
@@ -169,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/vfrdbfasimport
 
 %changelog
+* Sat Dec  1 2012 Thomas Sailer <t.sailer@alumni.ethz.ch> - 20121111-1
+- update to 20121111
+
 * Fri Aug 31 2012 Thomas Sailer <t.sailer@alumni.ethz.ch> - 20120831-1
 - update to 20120831