[gpsdrive] Rebuild for new boost and disable mapnik support
Hicham HAOUARI
hicham at fedoraproject.org
Mon Mar 12 11:45:55 UTC 2012
commit 24539f04d4de3098be899ea247eb2818badeb33a
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date: Mon Mar 12 11:45:48 2012 +0000
Rebuild for new boost and disable mapnik support
gpsdrive-2.11-fix-lm-dso.patch | 10 +++++++++
gpsdrive.spec | 42 +++++++++++++++++----------------------
2 files changed, 28 insertions(+), 24 deletions(-)
---
diff --git a/gpsdrive-2.11-fix-lm-dso.patch b/gpsdrive-2.11-fix-lm-dso.patch
new file mode 100644
index 0000000..862fa2a
--- /dev/null
+++ b/gpsdrive-2.11-fix-lm-dso.patch
@@ -0,0 +1,10 @@
+--- gpsdrive-2.11/src/CMakeLists.txt.lm-dso 2012-03-12 11:33:12.347973812 +0000
++++ gpsdrive-2.11/src/CMakeLists.txt 2012-03-12 11:33:37.834147334 +0000
+@@ -101,6 +101,7 @@ set(GPSDRIVE_LINK_LIBRARIES
+ ${SQLITE3_LIBRARIES}
+ ${CURL_LIBRARIES}
+ ${GPS_LIBRARIES}
++ m
+ )
+
+ set(gpsdrive_SRCS
diff --git a/gpsdrive.spec b/gpsdrive.spec
index 5608160..02c8f7f 100644
--- a/gpsdrive.spec
+++ b/gpsdrive.spec
@@ -1,7 +1,7 @@
Summary: A GPS based navigation tool
Name: gpsdrive
Version: 2.11
-Release: 13%{?dist}
+Release: 11%{?dist}
License: GPLv2+
Group: Applications/Productivity
URL: http://www.gpsdrive.de/index.shtml
@@ -20,6 +20,7 @@ Patch5: gpsdrive-2.11-add-gdk-pixbuf2.patch
Patch6: gpsdrive-2.11-set-boostfilesystemversion.patch
Patch7: gpsdrive-2.11-remove-Switch.patch
Patch8: gpsdrive-2.11-gpsd-2.96.patch
+Patch9: gpsdrive-2.11-fix-lm-dso.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.0.6
@@ -28,7 +29,6 @@ BuildRequires: desktop-file-utils
BuildRequires: pcre-devel
BuildRequires: autoconf m4
BuildRequires: cmake
-BuildRequires: mapnik-devel
BuildRequires: libxml2-devel
BuildRequires: libgda-devel
BuildRequires: boost-devel
@@ -45,10 +45,10 @@ BuildRequires: postgresql-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)
+Provides: perl(Geo::OSM::EntitiesV3) = %{version}
+Provides: perl(Geo::OSM::OsmReaderV5) = %{version}
+Provides: perl(Geo::OSM::EntitiesV5) = %{version}
+Provides: perl(Geo::OSM::OsmReaderV3) = %{version}
%description
Gpsdrive is a map-based navigation system.
@@ -72,12 +72,14 @@ Speech output is also available. MySQL is supported.
%patch6 -p1 -b .boostfilesystemver
%patch7 -p1 -b .removeswitch
%patch8 -p1 -b .gpsd296
+%patch9 -p1 -b .lm-dso
%build
mkdir build
export Boost_LIBRARYDIR=%{_libdir}
cd build
-%cmake ..
+%cmake -DWITH_MAPNIK=OFF \
+ ..
make VERBOSE=1 %{?_smp_mflags}
%install
@@ -89,16 +91,11 @@ 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 \
- --delete-original \
+desktop-file-validate \
${RPM_BUILD_ROOT}%{_datadir}/applications/gpsdrive.desktop
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -119,23 +116,20 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/gpsfetchmap.pl
%{_bindir}/gpspoint2gpsdrive.pl
%{_bindir}/nasaconv.sh
-%{_datadir}/applications/fedora-gpsdrive.desktop
-%{_datadir}/gpsdrive
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}
%{_datadir}/icons/map-icons
-%{_datadir}/icons/gpsdrive.png
+%{_datadir}/icons/%{name}.png
%{_mandir}/*/man1/*
%{_mandir}/man1/*
%{perl_vendorlib}/*
%changelog
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11-13
-- Rebuilt for c++ ABI breakage
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Nov 24 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 2.11-11
-- Rebuild for new boost
+* Tue Feb 21 2012 Hicham HAOUARI <hicham.haouari at gmail.com> - 2.11-11
+- Disable mapnik library support since its API changed
+- Add patch from debian 107-fix-disable-mapnik.patch
+ to workaround a known bug when disabling mapnik
+- Remove %%clean section
* Tue Aug 23 2011 Tom Callaway <spot at fedoraproject.org> - 2.11-10
- fix build against gpsd 2.96+
More information about the scm-commits
mailing list