[vfrnav/f17: 12/12] Merge branch 'master' into f17

[sailer]

commit c1316fe86f433fd790100b4ea1ea09d22f4020a2
Merge: 21aa417 b0d82ee
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Sat Dec 1 20:11:34 2012 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	vfrnav.spec

 .gitignore  |    1 +
 sources     |    2 +-
 vfrnav.spec |   20 +++++++++++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)
---
diff --cc vfrnav.spec
index 262f3e3,24c51d2..a26407d
--- a/vfrnav.spec
+++ b/vfrnav.spec
@@@ -40,9 -40,21 +40,14 @@@ BuildRequires:  libusb1-deve
  BuildRequires:  libcurl-devel
  BuildRequires:  webkitgtk3-devel
  BuildRequires:  transfig
+ BuildRequires:  texlive
 -BuildRequires:  texlive-texconfig
  BuildRequires:  texlive-latex
 -BuildRequires:  texlive-latex-bin-bin
 -BuildRequires:  texlive-epstopdf-bin
 -BuildRequires:  texlive-umlaute
 -BuildRequires:  texlive-multirow
 -BuildRequires:  texlive-oberdiek
 -BuildRequires:  texlive-tools
  BuildRequires:  poppler-utils
  BuildRequires:  readline-devel
+ BuildRequires:  geos-devel
+ BuildRequires:  polyclipping-devel
+ BuildRequires:  octave
+ BuildRequires:  octave-devel
  Requires:       gypsy
  
  %description