[vfrnav/f18: 16/16] Merge remote-tracking branch 'origin/master' into f18

[sailer]

commit 20473ec45b392dd49e2428724a38707b86b5340c
Merge: 97bb7c2 6d1f84d
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Sun Mar 10 04:22:14 2013 +0100

    Merge remote-tracking branch 'origin/master' into f18
    
    Conflicts:
    	vfrnav.spec

 .gitignore  |    2 ++
 sources     |    2 +-
 vfrnav.spec |   16 +++++++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --cc vfrnav.spec
index a68b5ac,52e5347..109ef3a
--- a/vfrnav.spec
+++ b/vfrnav.spec
@@@ -73,6 -76,11 +75,10 @@@ for the VFR navigation application
  
  %prep
  %setup -q
 -%patch0 -p0 -b .link
+ autoheader
+ aclocal -I m4
+ autoconf
+ automake -a -c
  
  %build
  %configure
@@@ -192,8 -201,14 +199,11 @@@ rm -rf $RPM_BUILD_ROO
  %{_bindir}/vfrdbfasimport
  
  %changelog
+ * Sun Mar 10 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130303-1
 -- update and rebuild for geos
++- update
+ 
 -* Mon Mar  4 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130123-2
 -- rebuild for polyclipping
 -
 -* Sat Jan 26 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130123-1
 -- rebuild for geos
 +* Fri Jan 18 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130113-1.1
 +- rebuild for polyclipping 5.0.3
  
  * Tue Jan 15 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130113-1
  - update to 20130113