[qlandkartegt/f16] update to 1.5.1
Dan Horák
sharkcz at fedoraproject.org
Wed Aug 29 13:13:08 UTC 2012
commit 8b3fdb7659546bfbcd215d5f3b4a317c4e7fb7d8
Author: Dan Horák <dan at danny.cz>
Date: Wed Aug 29 14:40:33 2012 +0200
update to 1.5.1
.gitignore | 1 +
qlandkartegt-1.5.1-qtsoap.patch | 144 +++++++++++++++++++++++++++++++++++++++
qlandkartegt.spec | 12 +++-
sources | 2 +-
4 files changed, 157 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d2c61d6..3227f11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/qlandkartegt-1.4.0.tar.gz
/qlandkartegt-1.4.2.tar.gz
/qlandkartegt-1.5.0.tar.gz
+/qlandkartegt-1.5.1.tar.gz
diff --git a/qlandkartegt-1.5.1-qtsoap.patch b/qlandkartegt-1.5.1-qtsoap.patch
new file mode 100644
index 0000000..e52f505
--- /dev/null
+++ b/qlandkartegt-1.5.1-qtsoap.patch
@@ -0,0 +1,144 @@
+From a918b49bdcdba8219c593183a588e7076a3be0f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Wed, 29 Aug 2012 14:22:50 +0200
+Subject: [PATCH] allow using system QtSoap library
+
+---
+ CMakeLists.txt | 3 ++
+ cmake/Modules/FindQtSoap.cmake | 73 ++++++++++++++++++++++++++++++++++++++++
+ src/CMakeLists.txt | 9 ++++-
+ 3 files changed, 83 insertions(+), 2 deletions(-)
+ create mode 100644 cmake/Modules/FindQtSoap.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c065a81..fed2c24 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,7 +71,10 @@ add_subdirectory(3rdparty/getopt)
+ add_subdirectory(3rdparty/map2gcm)
+ add_subdirectory(3rdparty/map2rmap)
+ add_subdirectory(3rdparty/cache2gtiff)
++find_package(QtSoap)
++if (NOT QTSOAP_FOUND)
+ add_subdirectory(3rdparty/qtsoap)
++endif()
+
+ if(WITH_PROFILING)
+ add_definitions(-DDO_PROFILING)
+diff --git a/cmake/Modules/FindQtSoap.cmake b/cmake/Modules/FindQtSoap.cmake
+new file mode 100644
+index 0000000..853d530
+--- /dev/null
++++ b/cmake/Modules/FindQtSoap.cmake
+@@ -0,0 +1,73 @@
++# - Try to find QtSoap
++# Once done this will define
++#
++# QTSOAP_FOUND - system has QTSOAP
++# QTSOAP_INCLUDE_DIRS - the QTSOAP include directory
++# QTSOAP_LIBRARIES - Link these to use QTSOAP
++# QTSOAP_DEFINITIONS - Compiler switches required for using QTSOAP
++#
++# Copyright (c) 2006 Andreas Schneider <mail at cynapses.org>
++# updated for QtSoap by Dan Horák
++#
++# Redistribution and use is allowed according to the terms of the New
++# BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++#
++
++
++if (QTSOAP_LIBRARIES AND QTSOAP_INCLUDE_DIRS)
++ # in cache already
++ set(QTSOAP_FOUND TRUE)
++else (QTSOAP_LIBRARIES AND QTSOAP_INCLUDE_DIRS)
++ find_path(QTSOAP_INCLUDE_DIRS
++ NAMES
++ qtsoap.h
++ PATHS
++ /usr/include
++ /usr/local/include
++ /opt/local/include
++ /sw/include
++ /usr/include/QtSoap
++ /usr/local/include/QtSoap
++ /opt/local/include/QtSoap
++ /sw/include/QtSoap
++ )
++
++ # debian uses version suffixes
++ # add suffix evey new release
++ find_library(QTSOAP_LIBRARIES
++ NAMES
++ qtsoap
++ PATHS
++ /usr/lib64
++ /usr/lib
++ /usr/local/lib
++ /opt/local/lib
++ /sw/lib
++ )
++
++ if (QTSOAP_INCLUDE_DIRS AND QTSOAP_LIBRARIES)
++ set(QTSOAP_FOUND TRUE)
++ endif (QTSOAP_INCLUDE_DIRS AND QTSOAP_LIBRARIES)
++
++ if (QTSOAP_FOUND)
++ if (NOT QTSOAP_FIND_QUIETLY)
++ message(STATUS "Found QtSoap: ${QTSOAP_LIBRARIES}")
++ endif (NOT QTSOAP_FIND_QUIETLY)
++ else (QTSOAP_FOUND)
++ if (QTSOAP_FIND_REQUIRED)
++ message(FATAL_ERROR "Could not find QtSoap")
++ endif (QTSOAP_FIND_REQUIRED)
++ endif (QTSOAP_FOUND)
++
++ # show the QTSOAP_INCLUDE_DIRS and QTSOAP_LIBRARIES variables only in the advanced view
++ mark_as_advanced(QTSOAP_INCLUDE_DIRS QTSOAP_LIBRARIES)
++
++endif (QTSOAP_LIBRARIES AND QTSOAP_INCLUDE_DIRS)
++
++if (WIN32)
++set(QTSOAP_FOUND FALSE)
++set(QTSOAP_LIBRARIES "")
++set(QTSOAP_INCLUDE_DIRS "")
++endif (WIN32)
++
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0ce3c3a..b6b3bb1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -538,6 +538,11 @@ else(EXIF_FOUND)
+ set(DMTX_LIBRARIES "")
+ ENDIF(DMTX_FOUND)
+
++IF(NOT QTSOAP_FOUND)
++ set(QTSOAP_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/3rdparty/qtsoap")
++ set(QTSOAP_LIBRARIES "qtsoap")
++ENDIF()
++
+
+ add_definitions(-DDB_VERSION=8)
+ SET(qlandkarte_HDRS ${qlandkarte_HDRS} CGeoDB.h CDlgSelGeoDBFolder.h CDlgEditFolder.h)
+@@ -630,8 +635,8 @@ include_directories(
+ ${CMAKE_SOURCE_DIR}/3rdparty/QZip
+ ${CMAKE_SOURCE_DIR}/3rdparty/QTextHtmlExporter
+ ${CMAKE_SOURCE_DIR}/3rdparty/getopt
+- ${CMAKE_SOURCE_DIR}/3rdparty/qtsoap
+ ${CMAKE_SOURCE_DIR}/3rdparty/conan/include
++ ${QTSOAP_INCLUDE_DIRS}
+ ${EXIF_INCLUDE_DIRS}
+ ${DMTX_INCLUDE_DIRS}
+ ${GPSD_INCLUDE_DIRS}
+@@ -705,7 +710,7 @@ target_link_libraries(
+ qzip
+ qtexthtmlexporter
+ getopt
+- qtsoap
++ ${QTSOAP_LIBRARIES}
+ ${PROFILING_LIBRARIES}
+ )
+
+--
+1.7.7.6
+
diff --git a/qlandkartegt.spec b/qlandkartegt.spec
index 8a89736..d1673cf 100644
--- a/qlandkartegt.spec
+++ b/qlandkartegt.spec
@@ -1,5 +1,5 @@
Name: qlandkartegt
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
Summary: GPS device mapping tool
@@ -10,6 +10,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# <GL/glu.h> not included by qt >= 4.8
Patch0: %{name}-1.3.0-glu.patch
+# use system QtSoap library
+Patch1: %{name}-1.5.1-qtsoap.patch
Requires: garmindev(interface) = 1.18
Requires: gpsbabel
@@ -22,6 +24,7 @@ BuildRequires: libexif-devel
BuildRequires: libdmtx-devel
BuildRequires: gpsd-devel
BuildRequires: qt-webkit-devel
+BuildRequires: qtsoap-devel
%if 0%{?fedora} >= 16
BuildRequires: libjpeg-devel
%endif
@@ -49,6 +52,10 @@ GDAL tools, but it will simplify their use to the demands of most users.
%prep
%setup -q
%patch0 -p1 -b .glu
+%patch1 -p1 -b .qtsoap
+
+# remove unbundled stuff
+rm -rf 3rdparty/qtsoap
# create build direcotory
mkdir build
@@ -81,6 +88,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
+* Wed Aug 29 2012 Dan Horák <dan[at]danny.cz> 1.5.1-1
+- update to 1.5.1
+
* Sat Jun 30 2012 Dan Horák <dan[at]danny.cz> 1.5.0-1
- update to 1.5.0
diff --git a/sources b/sources
index 3f2910c..d96ca1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6cee3d392ebbc13ec87f64a739a7225e qlandkartegt-1.5.0.tar.gz
+ca9c5f68c9aaa23c852d34c6d39e678d qlandkartegt-1.5.1.tar.gz
More information about the scm-commits
mailing list