Hello community,
here is the log from the commit of package gpsdrive for openSUSE:Factory
checked in at Mon Sep 27 10:31:39 CEST 2010.
--------
--- gpsdrive/gpsdrive.changes 2010-04-08 16:07:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/gpsdrive/gpsdrive.changes 2010-09-27 10:28:45.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 20 12:00:00 CEST 2010 - opensuse@dstoecker.de
+
+- update to 2.11 (no upstream changelog provided whatsoever)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gpsdrive-2.10pre4-overflow.patch
gpsdrive-2.10pre4.tar.bz2
gpsdrive-fgets.patch
gpsdrive-libpng14.patch
mapnik-handler.patch
New:
----
gpsdrive-2.11-fgets.patch
gpsdrive-2.11-overflow.patch
gpsdrive-2.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpsdrive.spec ++++++
--- /var/tmp/diff_new_pack.mm7dYz/_old 2010-09-27 10:30:54.000000000 +0200
+++ /var/tmp/diff_new_pack.mm7dYz/_new 2010-09-27 10:30:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gpsdrive (Version 2.10pre4)
+# spec file for package gpsdrive (Version 2.11)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,20 +19,28 @@
Name: gpsdrive
-BuildRequires: gcc-c++ gtk2-devel libart_lgpl-devel libpng14-devel libxml2-devel mysql-devel pcre-devel perl-libwww-perl update-desktop-files
+BuildRequires: gcc-c++ update-desktop-files
+BuildRequires: cmake
+BuildRequires: gtk2-devel libpng-devel
+BuildRequires: libxml2-devel
+BuildRequires: mapnik-devel
+BuildRequires: libcurl-devel
+BuildRequires: postgresql-devel
+BuildRequires: boost-devel
+BuildRequires: sqlite3-devel
+BuildRequires: speechd-devel
+BuildRequires: gpsd-devel
Url: http://www.kraftvoll.at/software/
License: GPLv2+
Group: Productivity/Graphics/Other
AutoReqProv: on
-Version: 2.10pre4
-Release: 93
+Version: 2.11
+Release: 1
Summary: Navigation via a GPS Receiver
Source: %{name}-%{version}.tar.bz2
Source1: %name.desktop
-Patch: mapnik-handler.patch
-Patch1: gpsdrive-fgets.patch
-Patch2: gpsdrive-2.10pre4-overflow.patch
-Patch3: gpsdrive-libpng14.patch
+Patch1: gpsdrive-2.11-fgets.patch
+Patch2: gpsdrive-2.11-overflow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -40,72 +48,36 @@
navigate using maps from http://www.mapblast.com or
http://www.expedia.com. Refer to the copyright of the maps.
-
-
-Authors:
---------
- Fritz Ganter
- A. Burak Ilgicioglu
- Alexander Wigen
- Andreas Hinz
- Christopher Jastram
- Damien Prat
- Dan Egnor
- Dirk-Jan Faber
- Douglas S. J. De Couto
- Emese Kovacs
- F�lix Martos
- Jaap Hogenberg
- Jacky Francois
- Joerg Ostertag
- Kevin Stephens
- Manfred Caruso
- Marco Molteni
- Martin Sjoegren
- Remco Treffkorn
- Richard Scheffenegger
- Russell Harding
- Stephen Wood
- Sven Fichtner
- Timothy Witham
- Wernle Daniel
- Yiannis Pailas
- Zdeno Podobny
-
-
%prep
%setup -q
-%patch -p0
-%patch1 -p0
-%patch2
-%patch3 -p1
+%patch1 -p1
+%patch2 -p1
%build
-# This package failed when testing with -Wl,-as-needed being default.
-# So we disable it here, if you want to retest, just delete this comment and the line below.
-export SUSE_ASNEEDED=0
-CFLAGS=$RPM_OPT_FLAGS ./configure --disable-mapnik --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir}
+pushd ..
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DCMAKE_C_FLAGS="%{optflags}" \
+ -DCMAKE_CXX_FLAGS="%{optflags}" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DDOC_INSTALL_DIR=%{_docdir} \
+ -DLIBGPS_OLD=off \
+ gpsdrive-2.11
make
%install
+pushd ..
make DESTDIR=$RPM_BUILD_ROOT install
-# I said: --disable-mapnik!
-rm -rf $RPM_BUILD_ROOT/usr/share/mapnik
-# Docs
-mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/gpsdrive
-mv $RPM_BUILD_ROOT/usr/share/gpsdrive/Documentation $RPM_BUILD_ROOT/usr/share/doc/packages/gpsdrive
-mv $RPM_BUILD_ROOT/usr/share/gpsdrive/DSL $RPM_BUILD_ROOT/usr/share/doc/packages/gpsdrive/
-# Cleanup perl
-rm -rf $RPM_BUILD_ROOT/usr/lib/perl5/vendor_perl/*/Utils
-# More cleanup
-rm -rf $RPM_BUILD_ROOT/usr/share/gpsdrive/gentoo
-rm -f $RPM_BUILD_ROOT/usr/share/gpsdrive/gpsdrive.desktop
-rm -f $RPM_BUILD_ROOT/usr/bin/geo-code $RPM_BUILD_ROOT/%{_mandir}/man1/geo-code.1
+popd
+
+# there must be a better way for this!
+mv $RPM_BUILD_ROOT/usr/lib/perl5/site_perl $RPM_BUILD_ROOT/usr/lib/perl5/vendor_perl
+
# desktop link
-mkdir $RPM_BUILD_ROOT/usr/share/pixmaps
-cp data/pixmaps/gpsicon.png $RPM_BUILD_ROOT/usr/share/pixmaps/gpsdrive.png
+mv $RPM_BUILD_ROOT/usr/share/icons $RPM_BUILD_ROOT/usr/share/pixmaps
%suse_update_desktop_file -i %name Utility DesktopUtility
+%find_lang %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -113,9 +85,9 @@
%postun -p /sbin/ldconfig
-%files
+%files -f %{name}.lang
%defattr(-,root,root)
-%doc README ChangeLog AUTHORS COPYING
+%doc ABOUT-NLS README ChangeLog AUTHORS COPYING Documentation DEVPACKAGES
%{_mandir}/man1/*
%{_mandir}/de/man1/*
%{_mandir}/es/man1/*
@@ -124,14 +96,11 @@
%dir /usr/share/gpsdrive
%dir /usr/share/gpsdrive/maps
%dir /usr/share/gpsdrive/pixmaps
-%dir /usr/share/gpsdrive/poi
+/usr/share/gpsdrive/osm-template.xml
+/usr/share/gpsdrive/pixmaps/gpsicon.xpm
/usr/share/gpsdrive/map_koord.txt
/usr/share/gpsdrive/pixmaps/*png
-/usr/share/gpsdrive/pixmaps/*gif
/usr/share/gpsdrive/maps/*
-/usr/share/gpsdrive/poi/*
-%dir /usr/share/map-icons
-/usr/share/map-icons/*
/usr/share/pixmaps/gpsdrive.png
%dir /usr/lib/perl5/*/*/Geo
%dir /usr/lib/perl5/*/*/Geo/Filter
@@ -145,5 +114,6 @@
/usr/lib/perl5/*/*/Geo/Gpsdrive/*
/usr/lib/perl5/*/*/Geo/OSM/*
/usr/lib/perl5/*/*/Geo/Tracks/*
+%exclude /usr/lib/perl5/*/*/Utils
%changelog
++++++ gpsdrive-2.11-fgets.patch ++++++
diff -ur gpsdrive-2.11//src/map_handler.c gpsdrive-2.11_f/src/map_handler.c
--- gpsdrive-2.11//src/map_handler.c 2010-07-20 11:24:33.000000000 +0200
+++ gpsdrive-2.11_f/src/map_handler.c 2010-06-24 21:53:32.000000000 +0200
@@ -393,7 +393,7 @@
gint max_nrmaps = 1000;
gchar buf[1512], center_lat[40], center_lon[40], scale_factor[40], filename[100], minlat[40],
minlon[40], maxlat[40], maxlon[40];
- gint p, e;
+ gint e;
if (mapconfig_active)
return FALSE;
@@ -434,7 +434,7 @@
maps = g_new (mapsstruct, max_nrmaps);
i = nrmaps = 0;
havenasa = -1;
- while ((p = fgets (buf, 1512, st) != 0))
+ while (fgets (buf, 1512, st))
{
if ((buf[0] == '#') || (buf[0] == '\0')) {
continue; /* line is a comment or blank */
diff -ur gpsdrive-2.11//src/waypoint.c gpsdrive-2.11_f/src/waypoint.c
--- gpsdrive-2.11//src/waypoint.c 2010-07-20 11:26:36.000000000 +0200
+++ gpsdrive-2.11_f/src/waypoint.c 2010-06-24 21:53:32.000000000 +0200
@@ -660,7 +660,7 @@
{
gchar fn_way_txt[2048];
FILE *st;
- gint i, e, p, wlan, action, proximity, tmp;
+ gint i, e, wlan, action, proximity, tmp;
gchar buf[512], slat[80], slong[80], typ[40];
struct stat stat_buf;
@@ -694,7 +694,7 @@
}
i = 0;
- while ((p = fgets (buf, 512, st) != 0))
+ while (fgets (buf, 512, st))
{
e = sscanf (buf, "%s %s %s %s %d %d %d %d %79s",
(wayp + i)->name, slat, slong, typ,
++++++ gpsdrive-2.10pre4-overflow.patch -> gpsdrive-2.11-overflow.patch ++++++
--- gpsdrive/gpsdrive-2.10pre4-overflow.patch 2010-03-02 01:11:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/gpsdrive/gpsdrive-2.11-overflow.patch 2010-07-20 13:31:18.000000000 +0200
@@ -1,6 +1,7 @@
---- src/friendsd.c
-+++ src/friendsd.c
-@@ -168,7 +168,7 @@
+diff -ur gpsdrive-2.11//src/friendsd.c gpsdrive-2.11_f/src/friendsd.c
+--- gpsdrive-2.11//src/friendsd.c 2010-07-20 11:30:13.000000000 +0200
++++ gpsdrive-2.11_f/src/friendsd.c 2010-06-24 21:53:32.000000000 +0200
+@@ -170,7 +170,7 @@
struct
{
char id[31];
++++++ gpsdrive-2.10pre4.tar.bz2 -> gpsdrive-2.11.tar.bz2 ++++++
++++ 276084 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org