dani/copr-dani-qgis
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Update to 2.0.1

Browse Source
This commit is contained in:
Volker Fröhlich 2013-09-24 00:48:15 +02:00
parent 011e352be8
commit 5d01156284
8 changed files with 67 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -6,3 +6,5 @@ qgis_1.5.0.tar.gz
/qgis-1.7.3.tar.bz2
/qgis-1.7.4.tar.bz2
/qgis-1.8.0.tar.bz2
/qgis-2.0.0.tar.bz2
/qgis-2.0.1.tar.bz2

37
qgis-1.8.0-datasource-crash.patch
View File

@ -1,37 +0,0 @@
commit 23a3412113a04fac0bdafffe9fc8a48c2a39e8ea
Author: Juergen E. Fischer <jef@norbit.de>
Date: Wed Jun 20 21:01:25 2012 +0200
fix #5809
diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
index 7b0bbb6..5b9837a 100644
--- a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
+++ b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
@@ -139,6 +139,8 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
, mWktHasZM( false )
, mWktZMRegexp( "\\s+(?:z|m|zm)(?=\\s*\\()", Qt::CaseInsensitive )
, mWktCrdRegexp( "(\\-?\\d+(?:\\.\\d*)?\\s+\\-?\\d+(?:\\.\\d*)?)\\s[\\s\\d\\.\\-]+" )
+ , mFile( 0 )
+ , mStream( 0 )
, mSkipLines( 0 )
, mFirstDataLine( 0 )
, mShowInvalidLines( false )
@@ -212,6 +214,7 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
{
QgsDebugMsg( "Data source " + dataSourceUri() + " could not be opened" );
delete mFile;
+ mFile = 0;
return;
}
@@ -447,7 +450,8 @@ QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
QgsDelimitedTextProvider::~QgsDelimitedTextProvider()
{
- mFile->close();
+ if ( mFile )
+ mFile->close();
delete mFile;
delete mStream;
}

236
qgis-1.8.0-qextserialport.patch
View File

@ -1,236 +0,0 @@
diff -Nur qgis-1.8.0/cmake/FindQextserialport.cmake qgis-1.8.0-qextserialport/cmake/FindQextserialport.cmake
--- qgis-1.8.0/cmake/FindQextserialport.cmake 1970-01-01 01:00:00.000000000 +0100
+++ qgis-1.8.0-qextserialport/cmake/FindQextserialport.cmake 2012-11-02 20:40:57.854520284 +0100
@@ -0,0 +1,43 @@
+# Find Qextserialport
+# ~~~~~~~~
+# Copyright (c) 2011, Jürgen E. Fischer <jef at norbit.de>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+# Once run this will define:
+#
+# QEXTSERIALPORT_FOUND = system has Qextserialport lib
+# QEXTSERIALPORT_LIBRARY = full path to the Qextserialport library
+# QEXTSERIALPORT_INCLUDE_DIR = where to find headers
+#
+
+
+FIND_PATH(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATHS
+ /usr/include
+ /usr/local/include
+ "$ENV{LIB_DIR}/include"
+ "$ENV{INCLUDE}"
+ PATH_SUFFIXES QtExtSerialPort
+ )
+
+FIND_LIBRARY(QEXTSERIALPORT_LIBRARY NAMES qextserialport-1.2 PATHS
+ /usr/lib
+ /usr/local/lib
+ "$ENV{LIB_DIR}/lib"
+ "$ENV{LIB}/lib"
+ )
+
+IF (QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARY)
+ SET(QEXTSERIALPORT_FOUND TRUE)
+ENDIF (QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARY)
+
+IF (QEXTSERIALPORT_FOUND)
+ IF (NOT QEXTSERIALPORT_FIND_QUIETLY)
+ MESSAGE(STATUS "Found Qextserialport: ${QEXTSERIALPORT_LIBRARY}")
+ ENDIF (NOT QEXTSERIALPORT_FIND_QUIETLY)
+ELSE (QEXTSERIALPORT_FOUND)
+ IF (QEXTSERIALPORT_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find Qextserialport")
+ ENDIF (QEXTSERIALPORT_FIND_REQUIRED)
+ENDIF (QEXTSERIALPORT_FOUND)
diff -Nur qgis-1.8.0/CMakeLists.txt qgis-1.8.0-qextserialport/CMakeLists.txt
--- qgis-1.8.0/CMakeLists.txt 2012-06-12 21:28:18.000000000 +0200
+++ qgis-1.8.0-qextserialport/CMakeLists.txt 2012-11-02 21:04:28.013021635 +0100
@@ -55,6 +55,8 @@
SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")
+SET (WITH_INTERNAL_QEXTSERIALPORT TRUE CACHE BOOL "Use internal build of Qextserialport")
+
SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")
IF (WITH_SPATIALITE)
SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
@@ -174,6 +176,10 @@
FIND_PACKAGE(QwtPolar REQUIRED)
ENDIF(NOT WITH_INTERNAL_QWTPOLAR)
+IF (NOT WITH_INTERNAL_QEXTSERIALPORT)
+ FIND_PACKAGE(Qextserialport REQUIRED)
+ENDIF(NOT WITH_INTERNAL_QEXTSERIALPORT)
+
IF (NOT WITH_INTERNAL_SPATIALITE)
FIND_PACKAGE(Sqlite3)
IF (NOT SQLITE3_FOUND)
diff -Nur qgis-1.8.0/python/CMakeLists.txt qgis-1.8.0-qextserialport/python/CMakeLists.txt
--- qgis-1.8.0/python/CMakeLists.txt 2012-06-12 21:28:18.000000000 +0200
+++ qgis-1.8.0-qextserialport/python/CMakeLists.txt 2012-11-02 20:49:38.101851101 +0100
@@ -14,6 +14,16 @@
)
ENDIF (WITH_INTERNAL_SPATIALITE)
+IF (WITH_INTERNAL_QEXTSERIALPORT)
+ INCLUDE_DIRECTORIES(
+ ../src/core/gps/qextserialport
+ )
+ELSE (WITH_INTERNAL_QEXTSERIALPORT)
+ INCLUDE_DIRECTORIES(
+ ${QEXTSERIALPORT_INCLUDE_DIR}
+ )
+ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
+
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
@@ -31,7 +41,6 @@
../src/core
../src/core/composer
../src/core/gps
- ../src/core/gps/qextserialport
../src/core/raster
../src/core/renderer
../src/core/symbology
diff -Nur qgis-1.8.0/src/app/CMakeLists.txt qgis-1.8.0-qextserialport/src/app/CMakeLists.txt
--- qgis-1.8.0/src/app/CMakeLists.txt 2012-06-12 21:28:18.000000000 +0200
+++ qgis-1.8.0-qextserialport/src/app/CMakeLists.txt 2012-11-02 22:29:40.327221781 +0100
@@ -394,7 +394,7 @@
${QT_QTUITOOLS_INCLUDE_DIR}
../analysis/raster
../core
- ../core/gps ../core/gps/qextserialport
+ ../core/gps
../core/composer ../core/raster ../core/renderer ../core/symbology ../core/symbology-ng
../gui ../gui/symbology-ng ../gui/attributetable
../plugins
@@ -402,6 +402,17 @@
gps
)
+IF (WITH_INTERNAL_QEXTSERIALPORT)
+ INCLUDE_DIRECTORIES(
+ ../core/gps/qextserialport
+ )
+ELSE (WITH_INTERNAL_QEXTSERIALPORT)
+ INCLUDE_DIRECTORIES(
+ ${QEXTSERIALPORT_INCLUDE_DIR}
+ )
+ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
+
+
IF (ANDROID)
INCLUDE_DIRECTORIES(${ANDROID_NDK_TOOLCHAIN_ROOT}/sysroot/usr/include)
ENDIF (ANDROID)
diff -Nur qgis-1.8.0/src/core/CMakeLists.txt qgis-1.8.0-qextserialport/src/core/CMakeLists.txt
--- qgis-1.8.0/src/core/CMakeLists.txt 2012-06-12 21:28:18.000000000 +0200
+++ qgis-1.8.0-qextserialport/src/core/CMakeLists.txt 2012-11-02 22:21:00.757952769 +0100
@@ -5,9 +5,6 @@
SET(QGIS_CORE_SRCS
- gps/qextserialport/qextserialport.cpp
- gps/qextserialport/qextserialenumerator.cpp
-
gps/qgsgpsconnection.cpp
gps/qgsgpsconnectionregistry.cpp
gps/qgsnmeaconnection.cpp
@@ -184,10 +181,14 @@
)
ADD_DEFINITIONS(-D_TTY_WIN_)
ELSE(WIN32)
- SET(QGIS_CORE_SRCS
- ${QGIS_CORE_SRCS}
- gps/qextserialport/posix_qextserialport.cpp
- )
+ IF (WITH_INTERNAL_QEXTSERIALPORT)
+ SET(QGIS_CORE_SRCS
+ ${QGIS_CORE_SRCS}
+ gps/qextserialport/qextserialport.cpp
+ gps/qextserialport/qextserialenumerator.cpp
+ gps/qextserialport/posix_qextserialport.cpp
+ )
+ ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
ADD_DEFINITIONS(-D_TTY_POSIX_)
ENDIF(WIN32)
@@ -198,6 +199,7 @@
)
ENDIF (QT_MOBILITY_LOCATION_FOUND)
+
IF (WITH_INTERNAL_SPATIALITE)
IF (WIN32 OR APPLE OR ANDROID)
INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
@@ -277,10 +279,15 @@
gps/qgsgpsdetector.h
gps/qgsnmeaconnection.h
gps/qgsgpsdconnection.h
- gps/qextserialport/qextserialport.h
- gps/qextserialport/qextserialenumerator.h
)
+IF (WITH_INTERNAL_QEXTSERIALPORT)
+ SET(QGIS_CORE_MOC_HDRS
+ ${QGIS_CORE_MOC_HDRS}
+ gps/qextserialport/qextserialport.h
+ gps/qextserialport/qextserialenumerator.h
+ )
+ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
IF (QT_MOBILITY_LOCATION_FOUND)
SET(QGIS_CORE_MOC_HDRS
@@ -435,6 +442,10 @@
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
+IF (NOT WITH_INTERNAL_QEXTSERIALPORT)
+ INCLUDE_DIRECTORIES(${QEXTSERIALPORT_INCLUDE_DIR})
+ENDIF (NOT WITH_INTERNAL_QEXTSERIALPORT)
+
IF (WIN32)
IF (MSVC)
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllexport)")
@@ -503,6 +514,10 @@
${SPATIALINDEX_LIBRARY}
)
+IF (NOT WITH_INTERNAL_QEXTSERIALPORT)
+ TARGET_LINK_LIBRARIES(qgis_core ${QEXTSERIALPORT_LIBRARY})
+ENDIF (NOT WITH_INTERNAL_QEXTSERIALPORT)
+
IF (WITH_INTERNAL_SPATIALITE)
IF (WIN32 OR APPLE)
TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
diff -Nur qgis-1.8.0/src/plugins/gps_importer/CMakeLists.txt qgis-1.8.0-qextserialport/src/plugins/gps_importer/CMakeLists.txt
--- qgis-1.8.0/src/plugins/gps_importer/CMakeLists.txt 2012-06-12 21:28:18.000000000 +0200
+++ qgis-1.8.0-qextserialport/src/plugins/gps_importer/CMakeLists.txt 2012-11-02 20:50:24.924541164 +0100
@@ -37,13 +37,23 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ../../core ../../core/gps ../../core/gps/qextserialport
+ ../../core ../../core/gps
../../gui
..
${EXPAT_INCLUDE_DIR}
)
+IF (WITH_INTERNAL_QEXTSERIALPORT)
+ INCLUDE_DIRECTORIES(
+ ../../core/gps/qextserialport
+ )
+ELSE (WITH_INTERNAL_QEXTSERIALPORT)
+ INCLUDE_DIRECTORIES(
+ ${QEXTSERIALPORT_INCLUDE_DIR}
+ )
+ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
+
TARGET_LINK_LIBRARIES(gpsimporterplugin
qgis_core
qgis_gui

12
qgis-1.8.0-spatialindex17.patch
View File

@ -1,12 +0,0 @@
diff -Nur qgis-1.8.0/cmake/FindSpatialindex.cmake qgis-1.8.0-spatialindex/cmake/FindSpatialindex.cmake
--- qgis-1.8.0/cmake/FindSpatialindex.cmake 2012-03-26 16:47:16.000000000 +0200
+++ qgis-1.8.0-spatialindex/cmake/FindSpatialindex.cmake 2012-04-08 14:04:56.986294861 +0200
@@ -12,7 +12,7 @@
FIND_PATH(SPATIALINDEX_INCLUDE_DIR NAMES SpatialIndex.h PATHS
- /usr/include
+ /usr/include/spatialindex
/usr/local/include
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"

27
qgis-1.8.0-sip410.patch → qgis-2.0.0-sip410.patch
View File

@ -1,40 +1,37 @@
SIP < 4.10 has no -o option, therefore causing builds to fail
http://hub.qgis.org/issues/5944
diff -Nur qgis-1.8.0/python/CMakeLists.txt qgis-1.8.0-sip410/python/CMakeLists.txt
--- qgis-1.8.0/python/CMakeLists.txt 2012-06-12 21:28:18.000000000 +0200
+++ qgis-1.8.0-sip410/python/CMakeLists.txt 2012-07-04 22:21:08.531677519 +0200
@@ -62,7 +62,7 @@
diff -Nur qgis-2.0.0/python/CMakeLists.txt qgis-2.0.0-sip410/python/CMakeLists.txt
--- qgis-2.0.0/python/CMakeLists.txt 2013-09-09 03:53:04.000000000 +0200
+++ qgis-2.0.0-sip410/python/CMakeLists.txt 2013-09-10 00:20:53.553086242 +0200
@@ -75,7 +75,7 @@
# core module
FILE(GLOB sip_files_core core/*.sip)
FILE(GLOB_RECURSE sip_files_core core/*.sip)
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.core.api)
+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.core.api)
ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core)
# additional gui includes
@@ -77,7 +77,7 @@
@@ -90,7 +90,7 @@
# gui module
FILE(GLOB sip_files_gui gui/*.sip)
FILE(GLOB_RECURSE sip_files_gui gui/*.sip)
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
ADD_SIP_PYTHON_MODULE(qgis.gui gui/gui.sip qgis_core qgis_gui)
# additional analysis includes
@@ -91,13 +91,13 @@
# analysis module
FILE(GLOB sip_files_analysis analysis/*.sip)
@@ -113,13 +113,13 @@
analysis/interpolation/*.sip
)
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis})
-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api)
+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api)
ADD_SIP_PYTHON_MODULE(qgis.analysis analysis/analysis.sip qgis_core qgis_analysis)
# network-analysis module
FILE(GLOB sip_files_network_analysis analysis/network/*.sip)
FILE(GLOB_RECURSE sip_files_network_analysis analysis/network/*.sip)
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_network_analysis})
-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.networkanalysis.api)
+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.networkanalysis.api)
ADD_SIP_PYTHON_MODULE(qgis.networkanalysis analysis/network/networkanalysis.sip qgis_core qgis_networkanalysis)
SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)
SET(QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)

12
qgis-2.0.1-httplib2.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Nur qgis-2.0.1/python/plugins/processing/admintools/CMakeLists.txt qgis-2.0.1-httplib2/python/plugins/processing/admintools/CMakeLists.txt
--- qgis-2.0.1/python/plugins/processing/admintools/CMakeLists.txt 2013-09-11 01:06:52.000000000 +0200
+++ qgis-2.0.1-httplib2/python/plugins/processing/admintools/CMakeLists.txt 2013-09-23 23:53:56.679847589 +0200
@@ -1,6 +1,5 @@
FILE(GLOB PY_FILES *.py)
ADD_SUBDIRECTORY(geoserver)
-ADD_SUBDIRECTORY(httplib2)
-PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
\ No newline at end of file
+PLUGIN_INSTALL(processing ./admintools ${PY_FILES})

69
qgis.spec
View File

@ -5,17 +5,21 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
# There is no PPC64 build for libspatialite
%ifnarch ppc ppc64
%global configure_with_spatialite -D WITH_SPATIALITE:BOOL=TRUE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
# libspatialite is present for PPC and PPC64 from F19 on
%ifarch ppc ppc64
%if ! (0%{?fedora} < 19 || 0%{?rhel})
%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
%endif
%else
%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
%endif
#WITH_GLOBE -- requires osgearth, which is still not packaged
#TODO: Run test suite (see debian/rules)
Name: qgis
Version: 1.8.0
Release: 16%{?dist}
Version: 2.0.1
Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System
# Update FSF address or ship a GPLv3+ license file
@ -39,15 +43,10 @@ Source5: %{name}-mime.xml
Patch0: %{name}-1.5.0-grass.patch
# Drop -o option from SIP, as versions older than 4.10 don't have it
Patch1: %{name}-1.8.0-sip410.patch
Patch1: %{name}-2.0.0-sip410.patch
# http://hub.qgis.org/issues/5809
# Crash when datasource is moved or deleted
Patch2: %{name}-1.8.0-datasource-crash.patch
#TODO: Upstream
# Use system version of qextserialport library
Patch3: %{name}-1.8.0-qextserialport.patch
# Remove httplib2 from the build system
Patch2: %{name}-2.0.1-httplib2.patch
# Leaving it to make life easier for ELGIS, as long as they target RHEL 5
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@ -68,8 +67,11 @@ BuildRequires: geos-devel
BuildRequires: grass-devel
BuildRequires: gsl-devel
#TODO: F19?
%ifnarch ppc ppc64
%ifarch ppc ppc64
%if ! (0%{?fedora} < 19 || 0%{?rhel})
BuildRequires: libspatialite-devel
%endif
%else
BuildRequires: libspatialite-devel
%endif
@ -79,7 +81,11 @@ BuildRequires: PyQt4-devel
BuildRequires: PyQwt-devel
BuildRequires: python-devel
BuildRequires: qt4-devel
# Fails to build with QT_MOBILITY
#http://hub.qgis.org/issues/7753
#BuildRequires: qt-mobility-devel
BuildRequires: qt4-webkit-devel
BuildRequires: qwt-devel
@ -88,15 +94,13 @@ BuildRequires: qwtpolar-devel
BuildRequires: sip-devel > 4.7
BuildRequires: spatialindex-devel
BuildRequires: sqlite-devel
BuildRequires: qscintilla-devel
# Enable for tests
#BuildRequires: xorg-x11-server-Xvfb
Requires: gpsbabel
# Obsoletes can be dropped after F15's EOL
Obsoletes: qgis-theme-classic < 1.1
Obsoletes: qgis-theme-gis < 1.1
Obsoletes: qgis-theme-nkids < 1.1
# We don't want to provide private Python extension libs
%global __provides_exclude_from ^%{python_sitearch}/.*\.so$
@ -134,6 +138,8 @@ Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: gdal-python
Requires: PyQt4
Requires: python-httplib2
Requires: qscintilla-python
%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
%description python
@ -157,22 +163,24 @@ Please refer to %{name}-mapserver-README.fedora for details!
%setup -q
%patch0 -p1 -b .grass~
%patch1 -p1 -b .sip410~
%patch2 -p1 -b .datasource~
%patch3 -p1 -b .qextserialport~
%patch2 -p1 -b .httplib2~
# Readme file for QGIS mapserver configuration and Lighttpd sample
install -pm0644 %{SOURCE4} .
# Delete bundled libs
rm -rf src/core/spatialite
rm -rf src/core/gps/qwtpolar
rm -rf src/core/gps/qwtpolar-{0.1,1.0}
rm -rf src/core/gps/qextserialport
rm -rf python/plugins/processing/admintools/httplib2
%build
# Necessary for the test suite
#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib}
#Info: TOUCH needs Qt >= 4.5
%cmake \
%{_cmake_skip_rpath} \
-D QGIS_LIB_SUBDIR=%{_lib} \
@ -189,12 +197,10 @@ rm -rf src/core/gps/qextserialport
-D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
-D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
-D WITH_PYSPATIALITE:BOOL=FALSE \
-D WITH_TOUCH:BOOL=TRUE \
%{configure_with_spatialite} \
.
#TODO: Not ready yet, according to Marco Bernasocchi
#-D WITH_QTMOBILITY:BOOL=TRUE \
#-D WITH_TOUCH:BOOL=TRUE \
make %{?_smp_mflags}
@ -263,8 +269,8 @@ pushd %{buildroot}%{_datadir}/%{name}/doc
popd
# Name of locale is wrong
mv %{buildroot}/usr/share/qgis/i18n/qgis_sr_CS-Latn.qm \
%{buildroot}/usr/share/qgis/i18n/qgis_sr@latin.qm
#mv %{buildroot}/usr/share/qgis/i18n/qgis_sr-Latn.qm \
#%{buildroot}/usr/share/qgis/i18n/qgis_sr@latin.qm
%find_lang %{name} --with-qt
@ -323,9 +329,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/lib%{name}sqlanyconnection.so.*
%{_libdir}/lib%{name}_networkanalysis.so.*
%{_libdir}/%{name}
%{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so
%{_bindir}/%{name}
%{_bindir}/qbrowser
%{_mandir}/man1/%{name}*
%{_mandir}/man1/%{name}.1*
%{_mandir}/man1/qbrowser.1*
%dir %{_datadir}/%{name}/
%{_datadir}/mime/packages/qgis.xml
%{_datadir}/pixmaps/%{name}.png
@ -367,6 +375,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libexecdir}/%{name}
%changelog
* Mon Sep 9 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-1
- New upstream release
* Tue Aug 27 2013 Orion Poplawski <orion@cora.nwra.com> - 1.8.0-16
- Rebuild for gdal 1.10.0

2
sources
View File

@ -1 +1 @@
1d60520f81d7763c026d0af887ac9a05 qgis-1.8.0.tar.bz2
3822c7dd70e2d893a0f1baa9c72316d2 qgis-2.0.1.tar.bz2