From 595a3224540ed970f90e5ca33fc86d0059e3964e Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Mar 10 2013 02:35:56 +0000 Subject: update & rebuild for geos --- diff --git a/.gitignore b/.gitignore index d1280c7..eb33679 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ vfrnav-0.4.tar.gz /vfrnav-20130110.tar.gz /vfrnav-20130113.tar.gz /vfrnav-20130123.tar.gz +/vfrnav-20130303.tar.gz diff --git a/sources b/sources index 4c0a99c..6d2edac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46af551b6957fd1131a385af972dc303 vfrnav-20130123.tar.gz +dd195906d5ed753afd8a3cd9b9c7e6ce vfrnav-20130303.tar.gz diff --git a/vfrnav-link.patch b/vfrnav-link.patch index c2af1f2..5991a21 100644 --- a/vfrnav-link.patch +++ b/vfrnav-link.patch @@ -1,5 +1,26 @@ ---- cfmu/Makefile.am.link 2012-11-21 23:17:54.000000000 +0100 -+++ cfmu/Makefile.am 2013-03-04 21:59:09.720212393 +0100 +--- flightdeck/Makefile.am.link 2013-03-04 22:48:01.541660297 +0100 ++++ flightdeck/Makefile.am 2013-03-04 23:39:28.599438323 +0100 +@@ -62,6 +62,7 @@ + + flightdeckftdieeprog_SOURCES = ftdieeprog.cc + flightdeckftdieeprog_LDADD = @GLIBMM_LIBS@ @FTDI_LIBS@ ++flightdeckftdieeprog_LDFLAGS = -pthread + endif + + EXTRA_DIST = ftdieeprog.cc +--- kingsim/Makefile.am.link 2013-03-05 01:36:39.919840319 +0100 ++++ kingsim/Makefile.am 2013-03-05 01:36:51.593930706 +0100 +@@ -2,7 +2,7 @@ + + kingsim_SOURCES = kingsim.cc simulator.cc + kingsim_LDADD = ../src/libvfrnav.a -lreadline @LIBS@ @GTKMM_LIBS@ @GLIBMM_LIBS@ @GIOMM_LIBS@ @PILOTLINK_LIBS@ @BOOST_LIBS@ @SQLITE3X_LIBS@ @OPENPTY_LIBS@ @GEOS_LIBS@ @CLIPPER_LIBS@ +-kingsim_LDFLAGS = @BOOST_LDFLAGS@ @GEOS_LDFLAGS@ @CLIPPER_LDFLAGS@ ++kingsim_LDFLAGS = @BOOST_LDFLAGS@ @GEOS_LDFLAGS@ @CLIPPER_LDFLAGS@ -pthread + + noinst_HEADERS = simulator.h + +--- cfmu/Makefile.am.link 2013-03-09 16:13:40.000000000 +0100 ++++ cfmu/Makefile.am 2013-03-10 03:34:36.074864346 +0100 @@ -7,26 +7,26 @@ cfmuvalidate_SOURCES = cfmuvalidate.cc cfmuvalidate.hh cfmuvalidate_LDADD = ../src/libvfrnav.a @LIBS@ @GTKMM_LIBS@ @GLIBMM_LIBS@ @GIOMM_LIBS@ \ @@ -15,7 +36,7 @@ libcfmuautoroute_a_SOURCES = cfmuautorouteproxy.cc cfmuautorouteproxy.hh - cfmuautoroute_SOURCES = autoroute.cc cfmuautoroute.cc cfmuautoroute.hh tfr.cc tfr.hh + cfmuautoroute_SOURCES = autoroute.cc cfmuautoroute.cc cfmuautoroute.hh tfr.hh tfr.cc tfrloader.cc tfrrules.cc interval.hh interval.cc cfmuautoroute_LDADD = libcfmuautoroute.a ../src/libvfrnav.a @LIBS@ @GTKMM_LIBS@ @GLIBMM_LIBS@ \ @GIOMM_LIBS@ @PILOTLINK_LIBS@ @BOOST_LIBS@ @SQLITE3X_LIBS@ @LIBXMLPP_LIBS@ @GEOS_LIBS@ @CLIPPER_LIBS@ -cfmuautoroute_LDFLAGS = @BOOST_LDFLAGS@ @GEOS_LDFLAGS@ @CLIPPER_LDFLAGS@ @@ -23,32 +44,11 @@ libcheckfpl_a_SOURCES = tfrproxy.cc tfrproxy.hh - checkfplan_SOURCES = checkfpl.cc tfr.cc tfr.hh + checkfplan_SOURCES = checkfpl.cc tfr.hh tfr.cc tfrloader.cc tfrrules.cc interval.hh interval.cc checkfplan_LDADD = libcheckfpl.a ../src/libvfrnav.a @LIBS@ @GTKMM_LIBS@ @GLIBMM_LIBS@ \ @GIOMM_LIBS@ @PILOTLINK_LIBS@ @BOOST_LIBS@ @SQLITE3X_LIBS@ @LIBXMLPP_LIBS@ @GEOS_LIBS@ @CLIPPER_LIBS@ -checkfplan_LDFLAGS = @BOOST_LDFLAGS@ @GEOS_LDFLAGS@ @CLIPPER_LDFLAGS@ +checkfplan_LDFLAGS = @BOOST_LDFLAGS@ @GEOS_LDFLAGS@ @CLIPPER_LDFLAGS@ -pthread - AM_CPPFLAGS = @CXXFLAGS@ @GTKMM_CFLAGS@ @GLIBMM_CFLAGS@ @GIOMM_CFLAGS@ @SQLITE_CFLAGS@ \ - @SQLITE3X_CFLAGS@ @ZFSTREAM_CFLAGS@ @PILOTLINK_CFLAGS@ @BOOST_CPPFLAGS@ \ ---- flightdeck/Makefile.am.link 2013-03-04 22:48:01.541660297 +0100 -+++ flightdeck/Makefile.am 2013-03-04 23:39:28.599438323 +0100 -@@ -62,6 +62,7 @@ - - flightdeckftdieeprog_SOURCES = ftdieeprog.cc - flightdeckftdieeprog_LDADD = @GLIBMM_LIBS@ @FTDI_LIBS@ -+flightdeckftdieeprog_LDFLAGS = -pthread - endif - - EXTRA_DIST = ftdieeprog.cc ---- kingsim/Makefile.am.link 2013-03-05 01:36:39.919840319 +0100 -+++ kingsim/Makefile.am 2013-03-05 01:36:51.593930706 +0100 -@@ -2,7 +2,7 @@ - - kingsim_SOURCES = kingsim.cc simulator.cc - kingsim_LDADD = ../src/libvfrnav.a -lreadline @LIBS@ @GTKMM_LIBS@ @GLIBMM_LIBS@ @GIOMM_LIBS@ @PILOTLINK_LIBS@ @BOOST_LIBS@ @SQLITE3X_LIBS@ @OPENPTY_LIBS@ @GEOS_LIBS@ @CLIPPER_LIBS@ --kingsim_LDFLAGS = @BOOST_LDFLAGS@ @GEOS_LDFLAGS@ @CLIPPER_LDFLAGS@ -+kingsim_LDFLAGS = @BOOST_LDFLAGS@ @GEOS_LDFLAGS@ @CLIPPER_LDFLAGS@ -pthread - - noinst_HEADERS = simulator.h - + AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include \ + @CXXFLAGS@ @GTKMM_CFLAGS@ @GLIBMM_CFLAGS@ @GIOMM_CFLAGS@ @SQLITE_CFLAGS@ \ diff --git a/vfrnav-svg.patch b/vfrnav-svg.patch deleted file mode 100644 index 3abb9a5..0000000 --- a/vfrnav-svg.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: doc/Makefile.am -=================================================================== -RCS file: /cvsroot/src_vfrnav/doc/Makefile.am,v -retrieving revision 1.21 -retrieving revision 1.23 -diff -u -r1.21 -r1.23 ---- doc/Makefile.am 15 Jan 2013 13:58:21 -0000 1.21 -+++ doc/Makefile.am 28 Jan 2013 03:48:03 -0000 1.23 -@@ -69,11 +69,15 @@ - .dvi.ps: - $(DVIPS) -f $< > $@ - --.svg.pdf: -- inkscape --without-gui --export-area-drawing --file=$< --export-pdf=$@ -- --.svg.eps: -- inkscape --without-gui --export-area-drawing --file=$< --export-eps=$@ -+#.svg.eps: -+# inkscape --without-gui --export-area-drawing --file=$< --export-eps=$@ -+# -+#.svg.pdf: -+# inkscape --without-gui --export-area-drawing --file=$< --export-pdf=$@ -+ -+%.pdf %.eps: %.svg -+ inkscape --without-gui --export-area-drawing --file=$< --export-eps=$*.eps || : -+ inkscape --without-gui --export-area-drawing --file=$< --export-pdf=$*.pdf || : - - .fig.eps: - $(FIG2DEV) -L eps -m 1 $< $@ -@@ -131,7 +135,7 @@ - flightdeck.pdf flightdeck.toc flightdeck.lof flightdeck.lot \ - $(FIGSRC:.fig=.eps) $(FIGSRC:.fig=.pdf) $(EPSSRC:.eps=.pdf) $(PSSRC:.ps=.pdf) \ - $(JPGSRC:.jpg=.eps) $(TIFFSRC:.tiff=.eps) $(TIFFSRC:.tiff=.png) $(TEXSRC:.tex=.aux) \ -- $(SVGSRC:.fig=.eps) $(SVGSRC:.fig=.pdf) $(BUILTEPSSRC) $(BUILTEPSSRC:.eps=.pdf) \ -+ $(SVGSRC:.svg=.eps) $(SVGSRC:.svg=.pdf) $(BUILTEPSSRC) $(BUILTEPSSRC:.eps=.pdf) \ - $(PDFSRC:.pdfsrc=.eps) $(PDFSRC:.pdfsrc=.pdf) $(DVI) proptbl.cc p28rperf.done - - $(HAMPROPEPS): proptbl.cc diff --git a/vfrnav.spec b/vfrnav.spec index 2b20e4a..cb260b9 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,14 +1,13 @@ Name: vfrnav -Version: 20130123 -Release: 2%{?dist} +Version: 20130303 +Release: 1%{?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 -Patch0: vfrnav-clipper51.patch -Patch1: vfrnav-link.patch +Patch0: vfrnav-link.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm30-devel @@ -75,8 +74,7 @@ for the VFR navigation application. %prep %setup -q -%patch0 -p0 -b .clipper51 -%patch1 -p0 -b .link +%patch0 -p0 -b .link autoheader aclocal -I m4 autoconf @@ -200,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/vfrdbfasimport %changelog +* Sun Mar 10 2013 Thomas Sailer - 20130303-1 +- update and rebuild for geos + * Mon Mar 4 2013 Thomas Sailer - 20130123-2 - rebuild for polyclipping