rpms/gpsdrive/F-11 gpsdrive-2.10pre7-fedora.patch, NONE, 1.1 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 gpsdrive.spec, 1.6, 1.7 gpsdrive-2.09-CVE-2008-5703.patch, 1.1, NONE gpsdrive-2.09-gcc43.patch, 1.1, NONE gpsdrive-2.09-gps-mysql.patch, 1.1, NONE gpsdrive-2.09-greek.patch, 1.1, NONE gpsdrive-disable-gcc3-test.patch, 1.1, NONE

Sat Jul 4 05:25:58 UTC 2009

Author: kevin

Update of /cvs/extras/rpms/gpsdrive/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5981

Modified Files:
	sources .cvsignore gpsdrive.spec 
Added Files:
	gpsdrive-2.10pre7-fedora.patch 
Removed Files:
	gpsdrive-2.09-CVE-2008-5703.patch gpsdrive-2.09-gcc43.patch 
	gpsdrive-2.09-gps-mysql.patch gpsdrive-2.09-greek.patch 
	gpsdrive-disable-gcc3-test.patch 
Log Message:
update to 2.10pre7


gpsdrive-2.10pre7-fedora.patch:

--- NEW FILE gpsdrive-2.10pre7-fedora.patch ---
diff -Nur gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/CMakeLists.txt gpsdrive-2.10pre7/scripts/osm/perl_lib/CMakeLists.txt
--- gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/CMakeLists.txt	2009-06-14 07:57:25.000000000 -0600
+++ gpsdrive-2.10pre7/scripts/osm/perl_lib/CMakeLists.txt	2009-06-17 11:13:56.000000000 -0600
@@ -16,7 +16,7 @@
         foreach(perl_module ${perl_modules})
           file(RELATIVE_PATH relative_module_path ${CMAKE_CURRENT_SOURCE_DIR} ${perl_module})
           get_filename_component(relative_module_path ${relative_module_path} PATH)
-          install(FILES ${perl_module} DESTINATION ${PERL_SITELIB}/${relative_module_path})
+          install(FILES ${perl_module} DESTINATION ${PERL_VENDORLIB}/${relative_module_path})
           #message("DEBUG: install ${perl_module} to ${PERL_SITELIB}/${relative_module_path}")
         endforeach(perl_module ${perl_modules})
       endif (perl_modules)
diff -Nur gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm gpsdrive-2.10pre7/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm
--- gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm	2009-06-14 07:57:25.000000000 -0600
+++ gpsdrive-2.10pre7/scripts/osm/perl_lib/Geo/Gpsdrive/getstreet.pm	2009-06-21 19:41:12.000000000 -0600
@@ -2,7 +2,7 @@
 #noch nicht alle variablen angepasst
 use LWP::UserAgent;
 use WWW::Mechanize;
-use Text::Query;
+#use Text::Query;
 use Getopt::Long; #maybe not needed any more
 use Pod::Usage;
 use DBI;
diff -Nur gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/Geo/OSM/Upload.pm gpsdrive-2.10pre7/scripts/osm/perl_lib/Geo/OSM/Upload.pm
--- gpsdrive-2.10pre7.orig/scripts/osm/perl_lib/Geo/OSM/Upload.pm	2009-06-14 07:57:25.000000000 -0600
+++ gpsdrive-2.10pre7/scripts/osm/perl_lib/Geo/OSM/Upload.pm	2009-06-21 19:40:48.000000000 -0600
@@ -4,7 +4,7 @@
 use warnings;
 
 
-use WWW::Curl::easy;
+use WWW::Curl::Easy;
 
 sub new(){bless{}};
 
diff -Nur gpsdrive-2.10pre7.orig/src/gpsdrive_config.c gpsdrive-2.10pre7/src/gpsdrive_config.c
--- gpsdrive-2.10pre7.orig/src/gpsdrive_config.c	2009-06-14 07:57:25.000000000 -0600
+++ gpsdrive-2.10pre7/src/gpsdrive_config.c	2009-06-22 22:22:10.000000000 -0600
@@ -884,7 +884,7 @@
 	g_snprintf(local_config.mapnik_input_path, sizeof(local_config.mapnik_input_path),
 		"%s", "/usr/lib/mapnik/0.5/input/");
 	g_snprintf(local_config.mapnik_font_path, sizeof(local_config.mapnik_font_path),
-		"%s", "/usr/share/fonts/truetype/ttf-dejavu/");
+		"%s", "/usr/share/fonts/dejavu/");
 	
 	/* kismet default values */
 	g_strlcpy(local_config.kismet_servername, "127.0.0.1", sizeof(local_config.kismet_servername));


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsdrive/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Jun 2007 02:01:56 -0000	1.2
+++ sources	4 Jul 2009 05:25:27 -0000	1.3
@@ -1 +1,2 @@
-eaa52cb220f3d10312a1046dd47126bb  gpsdrive-2.09.tar.gz
+f369ecdbb73d4ff5ae10da6fd2ee5f5e  openstreetmap-map-icons-minimal.tar.gz
+dd5e1382bae11a5514e4fd6853eb062e  gpsdrive-2.10pre7.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsdrive/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jun 2007 02:01:56 -0000	1.2
+++ .cvsignore	4 Jul 2009 05:25:27 -0000	1.3
@@ -1 +1,2 @@
-gpsdrive-2.09.tar.gz
+openstreetmap-map-icons-minimal.tar.gz
+gpsdrive-2.10pre7.tar.gz


Index: gpsdrive.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsdrive/F-11/gpsdrive.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gpsdrive.spec	25 Feb 2009 00:43:22 -0000	1.6
+++ gpsdrive.spec	4 Jul 2009 05:25:27 -0000	1.7
@@ -1,24 +1,46 @@
 Summary: A GPS based navigation tool 
 Name: gpsdrive
-Version: 2.09
-Release: 8%{?dist}
+Version: 2.10
+Release: 0.1.pre7%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://www.gpsdrive.de/index.shtml
-Source: http://www.gpsdrive.de/packages/gpsdrive-2.09.tar.gz
-Patch0: gpsdrive-disable-gcc3-test.patch
-Patch1: gpsdrive-2.09-greek.patch
-Patch2: gpsdrive-2.09-gcc43.patch
-Patch3: gpsdrive-2.09-gps-mysql.patch
-Patch4: gpsdrive-2.09-CVE-2008-5703.patch
+# svn snapshot generated with: 
+# svn co https://gpsdrive.svn.sourceforge.net/svnroot/gpsdrive/trunk gpsdrive-2.10-datesvn
+# tar cvzpf gpsdrive-2.10-datesvn.tar.gz gpsdrive-2.10-datesvn
+#Source: http://www.gpsdrive.de/packages/gpsdrive-2.10-20090607svn.tar.gz
+Source0: http://www.gpsdrive.de/packages/gpsdrive-2.10pre7.tar.gz
+Source1: http://download.sourceforge.net/sourceforge/gpsdrive/openstreetmap-map-icons-minimal.tar.gz
+Patch1: gpsdrive-2.10pre7-fedora.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: gtk2-devel >= 2.0.6
-BuildRequires: gettext
+BuildRequires: gettext intltool
 BuildRequires: desktop-file-utils
 BuildRequires: pcre-devel
 BuildRequires: autoconf m4
+BuildRequires: cmake
+BuildRequires: mapnik-devel
+BuildRequires: libxml2-devel
+BuildRequires: libgda-devel
+BuildRequires: boost-devel
+BuildRequires: sqlite-devel
+BuildRequires: libicu-devel
+BuildRequires: libtool-ltdl-devel
+BuildRequires: perl-devel
+BuildRequires: libcurl-devel
+BuildRequires: compat-libgda-devel
+BuildRequires: gpsd-devel
+BuildRequires: speech-dispatcher-devel
+
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: gpsd
 
+Provides: perl(Geo::OSM::EntitiesV3)
+Provides: perl(Geo::OSM::OsmReaderV5)
+Provides: perl(Geo::OSM::EntitiesV5)
+Provides: perl(Geo::OSM::OsmReaderV3)  
+
 %description
 Gpsdrive is a map-based navigation system. 
 It displays your position on a zoomable map 
@@ -30,81 +52,30 @@ bearing, arrival time, actual position, 
 Speech output is also available. MySQL is supported.
 
 %prep
-%setup -q
+%setup -q -n gpsdrive-2.10pre7
+%setup -q -a 1 -T -D -n gpsdrive-2.10pre7
 
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-# Convert 8859 man pages to UTF-8
-for f in man/es/gpsdrive.1 man/de/gpsdrive.1 ; do
-    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
-
-# move greek from gr to el
-mv po/gr.gmo po/le.gmo
-mv po/gr.po po/le.po
-
-# make wp2sql script work. 
-sed -i -e '1i #!/bin/sh' wp2sql
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-%configure --disable-static
-make %{?_smp_mflags}
+mkdir build
+cd build
+%cmake ..
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
+cd build
 make install DESTDIR=$RPM_BUILD_ROOT
 
-chmod 755 $RPM_BUILD_ROOT/%{_datadir}/gpsdrive/wp2sql
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-# Don't ship local gpsd, depend on gpsd package
-rm -f $RPM_BUILD_ROOT%{_bindir}/gpsd
-
-# remove .so files as they are the only thing that would be in a devel subpackage. 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libfly.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/libnautic.so
-
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/gpsdrive.desktop
-
-# remove doc files from sharedir, as they are packaged 
-# in docdir in this package. 
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/AUTHORS
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/CREDITS
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/FAQ.gpsdrive
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/FAQ.gpsdrive.fr
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/GPS-receivers
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/LEEME
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/LISEZMOI
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/NMEA.txt
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/README
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/README.FreeBSD
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/README.SQL
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/README.gpspoint2gspdrive
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/README.kismet
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/README.nasamaps
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/TODO
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/gpsdrive/create.sql
-
-# remove geo-code for CVE-2008-4959
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/geo-code
-
-# remove geo-nearest for CVE-2008-5380
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/geo-nearest
-
-# remove gpssmswatch for CVE-2008-5703
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/gpssmswatch
+cd ..
+mkdir -p $RPM_BUILD_ROOT/usr/share/icons/map-icons/
+cp -a usr/share/icons/map-icons/* $RPM_BUILD_ROOT/usr/share/icons/map-icons/
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        gpsdrive.desktop
+        --delete-original                                       \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/gpsdrive.desktop
 
 %find_lang %{name}
 
@@ -117,39 +88,35 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr (-,root,root,-)
-%doc GPS-receivers AUTHORS COPYING CREDITS TODO
-%doc TODO README LEEME LISEZMOI README.FreeBSD README.nasamaps
-%doc README.gpspoint2gspdrive FAQ.gpsdrive FAQ.gpsdrive.fr
-%doc README.SQL create.sql  NMEA.txt README.kismet  LISEZMOI.kismet LISEZMOI.SQL
-%doc %{_mandir}/de/man1/gpsdrive.1*
-%doc %{_mandir}/es/man1/gpsdrive.1*
-%doc %{_mandir}/man1/gpsdrive.1*
-%{_libdir}/libfly*
-%{_libdir}/libnautic*
-%{_bindir}/friendsd2
-%{_bindir}/garble
-%{_bindir}/geocache2way
+%doc ABOUT-NLS AUTHORS ChangeLog COPYING README Documentation/*
+%{_bindir}/friendsd
+%{_bindir}/gdal_slice.sh
+%{_bindir}/geocache2way.pl
+%{_bindir}/gpsd-connect-bluetooth.sh
+%{_bindir}/gpsreplay.pl
+%{_bindir}/geoinfo.pl
+%{_bindir}/gpsd_nmea.sh
 %{_bindir}/gpsdrive
+%{_bindir}/gpsdrive-update-mapnik-poitypes.pl
+%{_bindir}/gpsdrive_mapnik_gentiles.*
 %{_bindir}/gpsfetchmap.pl
 %{_bindir}/gpspoint2gpsdrive.pl
-%{_bindir}/gpsreplay
-%{_bindir}/gpssql_backup.sh
-%{_bindir}/gpssql_restore.sh
-%{_bindir}/wpcvt
-%{_bindir}/wpget
-%dir %{_datadir}/gpsdrive
-%{_datadir}/gpsdrive/gpsdrivesplash.png
-%{_datadir}/gpsdrive/gpsdrivemini.png
-%{_datadir}/gpsdrive/friendsicon.png
-%{_datadir}/gpsdrive/gpsicon.png
-%{_datadir}/gpsdrive/gpsiconbt.png
-%{_datadir}/gpsdrive/gpsdriveanim.gif
-%{_datadir}/gpsdrive/top_GPSWORLD.jpg
-%{_datadir}/gpsdrive/wp2sql
+%{_bindir}/nasaconv.sh
 %{_datadir}/applications/fedora-gpsdrive.desktop
-%{_datadir}/pixmaps/gpsicon.png
+%{_datadir}/gpsdrive
+%{_datadir}/icons/map-icons
+%{_datadir}/icons/gpsdrive.png
+%{_mandir}/*/man1/*
+%{_mandir}/man1/*
+%{perl_vendorlib}/*
 
 %changelog
+* Tue Jun 16 2009 Kevin Fenzi <kevin at tummy.com> - 2.10-0.1.pre7
+- update to 2.10pre7
+
+* Sun Jun 07 2009 Kevin Fenzi <kevin at tummy.com> - 2.10-0.1.20090607svn
+- update to 2.10-20090607svn
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.09-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- gpsdrive-2.09-CVE-2008-5703.patch DELETED ---


--- gpsdrive-2.09-gcc43.patch DELETED ---


--- gpsdrive-2.09-gps-mysql.patch DELETED ---


--- gpsdrive-2.09-greek.patch DELETED ---


--- gpsdrive-disable-gcc3-test.patch DELETED ---


