rpms/gpsdrive/F-13 gpsdrive-2.10-fix-dso-linking.patch, NONE, 1.1 gpsdrive-2.10-newgps.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 gpsdrive.spec, 1.11, 1.12 sources, 1.3, 1.4
Hicham HAOUARI
hicham at fedoraproject.org
Mon May 10 18:38:50 UTC 2010
Author: hicham
Update of /cvs/pkgs/rpms/gpsdrive/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8345/F-13
Modified Files:
.cvsignore gpsdrive.spec sources
Added Files:
gpsdrive-2.10-fix-dso-linking.patch gpsdrive-2.10-newgps.patch
import.log
Log Message:
gpsdrive-2.10-fix-dso-linking.patch:
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE gpsdrive-2.10-fix-dso-linking.patch ---
--- gpsdrive-2.10-20100508/src/CMakeLists.txt.old 2010-05-10 01:17:03.000000000 +0100
+++ gpsdrive-2.10-20100508/src/CMakeLists.txt 2010-05-10 01:18:26.000000000 +0100
@@ -28,7 +28,7 @@ if (WITH_GDA3)
endif (WITH_GDA3)
if (WITH_MAPNIK)
- find_package(Boost COMPONENTS filesystem REQUIRED)
+ find_package(Boost COMPONENTS filesystem system thread REQUIRED)
find_package(Mapnik REQUIRED)
add_definitions(-DMAPNIK)
endif (WITH_MAPNIK)
@@ -172,7 +172,7 @@ if (WITH_MAPNIK)
)
set(GPSDRIVE_LINK_LIBRARIES
${GPSDRIVE_LINK_LIBRARIES}
- ${Boost_FILESYSTEM_LIBRARY}
+ ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY}
${MAPNIK_LIBRARIES}
)
endif (WITH_MAPNIK)
gpsdrive-2.10-newgps.patch:
FindBoost.cmake | 2 +-
FindGTK2.cmake | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
--- NEW FILE gpsdrive-2.10-newgps.patch ---
diff -Nur gpsdrive-2.10-20100508.sav/cmake/Modules/FindBoost.cmake gpsdrive-2.10-20100508/cmake/Modules/FindBoost.cmake
--- gpsdrive-2.10-20100508.sav/cmake/Modules/FindBoost.cmake 2010-05-08 20:56:16.000000000 -0600
+++ gpsdrive-2.10-20100508/cmake/Modules/FindBoost.cmake 2010-05-09 14:28:05.000000000 -0600
@@ -78,7 +78,7 @@
# MESSAGE(STATUS "Finding Boost libraries.... ")
-SET( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS} "1.33" "1.33.0" "1.33.1" "1.34" "1.34.0" "1.34.1" )
+SET( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS} "1.33" "1.33.0" "1.33.1" "1.34" "1.34.0" "1.34.1" "1.41.0")
############################################
#
diff -Nur gpsdrive-2.10-20100508.sav/cmake/Modules/FindGTK2.cmake gpsdrive-2.10-20100508/cmake/Modules/FindGTK2.cmake
--- gpsdrive-2.10-20100508.sav/cmake/Modules/FindGTK2.cmake 2010-05-08 20:56:16.000000000 -0600
+++ gpsdrive-2.10-20100508/cmake/Modules/FindGTK2.cmake 2010-05-09 13:35:59.000000000 -0600
@@ -228,6 +228,30 @@
/opt/gnome/lib
)
+ FIND_LIBRARY(GTK2_PANGO_LIBRARY
+ NAMES
+ pango-1.0
+ PATHS
+ ${_GDK2_LIBDIR}
+ /usr/lib
+ /usr/local/lib
+ /usr/openwin/lib
+ /usr/X11R6/lib
+ /opt/gnome/lib
+ )
+
+ FIND_LIBRARY(GTK2_GDK_PIXBUF_LIBRARY
+ NAMES
+ gdk_pixbuf-2.0
+ PATHS
+ ${_GDK2_LIBDIR}
+ /usr/lib
+ /usr/local/lib
+ /usr/openwin/lib
+ /usr/X11R6/lib
+ /opt/gnome/lib
+ )
+
FIND_LIBRARY(GTK2_GMODULE_LIBRARY
NAMES
gmodule-2.0
@@ -312,6 +336,9 @@
SET(GTK2_LIBRARIES
${GTK2_GTK_LIBRARY}
${GTK2_GDK_LIBRARY}
+ ${GTK2_GDK_PIXBUF_LIBRARY}
+ ${GTK2_GOBJECT_LIBRARY}
+ ${GTK2_PANGO_LIBRARY}
${GTK2_GLIB_LIBRARY}
)
#${GTK2_GOBJECT_LIBRARY})
--- NEW FILE import.log ---
gpsdrive-2_10-0_6_pre7_fc13:F-13:gpsdrive-2.10-0.6.pre7.fc13.src.rpm:1273516521
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpsdrive/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 29 Jun 2009 01:53:49 -0000 1.3
+++ .cvsignore 10 May 2010 18:38:49 -0000 1.4
@@ -1,2 +1,2 @@
-openstreetmap-map-icons-minimal.tar.gz
gpsdrive-2.10pre7.tar.gz
+openstreetmap-map-icons-minimal.tar.gz
Index: gpsdrive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsdrive/F-13/gpsdrive.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gpsdrive.spec 21 Jan 2010 19:48:13 -0000 1.11
+++ gpsdrive.spec 10 May 2010 18:38:49 -0000 1.12
@@ -1,7 +1,7 @@
Summary: A GPS based navigation tool
Name: gpsdrive
Version: 2.10
-Release: 0.5.pre7%{?dist}
+Release: 0.6.pre7%{?dist}
License: GPLv2+
Group: Applications/Productivity
URL: http://www.gpsdrive.de/index.shtml
@@ -13,6 +13,8 @@ Source0: http://www.gpsdrive.de/packages
Source1: http://download.sourceforge.net/sourceforge/gpsdrive/openstreetmap-map-icons-minimal.tar.gz
Patch1: gpsdrive-2.10pre7-fedora.patch
Patch2: gpsdrive-2.10pre7-usepc.patch
+Patch3: gpsdrive-2.10-newgps.patch
+Patch4: gpsdrive-2.10-fix-dso-linking.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.0.6
@@ -58,6 +60,8 @@ Speech output is also available. MySQL i
%patch1 -p1
%patch2 -p1 -b .usepc
+%patch3 -p1 -b .new-gps
+%patch4 -p1 -b .dso-linking-fix
%build
mkdir build
@@ -113,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/*
%changelog
+* Mon May 10 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 2.10-0.6.pre7
+- Rebuild for new libgps
+
* Fri Jan 22 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 2.1.0-0.5.pre7
- Rebuild for Boost soname bump
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpsdrive/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 29 Jun 2009 01:53:49 -0000 1.3
+++ sources 10 May 2010 18:38:50 -0000 1.4
@@ -1,2 +1,2 @@
-f369ecdbb73d4ff5ae10da6fd2ee5f5e openstreetmap-map-icons-minimal.tar.gz
dd5e1382bae11a5514e4fd6853eb062e gpsdrive-2.10pre7.tar.gz
+f369ecdbb73d4ff5ae10da6fd2ee5f5e openstreetmap-map-icons-minimal.tar.gz
More information about the scm-commits
mailing list