From f771cf0b826d1b5a37332324f24fdeb3d2e3e2f4 Mon Sep 17 00:00:00 2001
From: Thomas Sailer <t.sailer@alumni.ethz.ch>
Date: Nov 27 2013 23:27:00 +0000
Subject: Merge remote-tracking branch 'origin/master' into f20


Conflicts:
	.gitignore

---

diff --git a/.gitignore b/.gitignore
index 9129de1..bd2e844 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 vfrnav-*.tar.gz
+/vfrnav-20131127.tar.gz
diff --git a/sources b/sources
index f7d1958..0224c16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6bc2000194665bd5b9c9d3aba87b7c4a  vfrnav-20130920.tar.gz
+aeb1184f1a4889f1cd66d2dba04df497  vfrnav-20131127.tar.gz
diff --git a/vfrnav.spec b/vfrnav.spec
index f66cc8d..9d031cc 100644
--- a/vfrnav.spec
+++ b/vfrnav.spec
@@ -1,5 +1,5 @@
 Name:           vfrnav
-Version:        20130920
+Version:        20131127
 Release:        1%{?dist}
 Summary:        VFR/IFR Navigation
 
@@ -161,6 +161,12 @@ 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
 
+rm -f $RPM_BUILD_ROOT/%{_bindir}/cfmusidstar
+
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libvfrnav.so
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libvfrnav.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libvfrnav.a
+
 install -d $RPM_BUILD_ROOT/run/vfrnav/validator
 install -d $RPM_BUILD_ROOT/var/lib/vfrnav
 
@@ -219,6 +225,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/acftperformance.ui
 %{_datadir}/%{name}/cfmuvalidate.ui
 %{_libdir}/libreoffice/share/registry/vfrnav.xcd
+%{_libdir}/libvfrnav.so.0
+%{_libdir}/libvfrnav.so.0.0.0
 %{_bindir}/vfrnav
 %{_bindir}/vfrnavaideditor
 %{_bindir}/vfrwaypointeditor
@@ -306,6 +314,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Nov 27 2013 Thomas Sailer <t.sailer@alumni.ethz.ch> - 20131127-1
+- update to 20131127
+
 * Mon Sep 23 2013 Thomas Sailer <t.sailer@alumni.ethz.ch> - 20130920-1
 - update to 20130920