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

New upstream release 2.2.0

Browse Source 
- Drop EL5 support leftovers
- Remove private provides
- Simplify conditionals
- Remove custom plugin directory setting
This commit is contained in:
Volker Fröhlich 2014-03-06 00:19:04 +01:00
parent 783315385f
commit a82beb8e0c
10 changed files with 170 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ qgis_1.5.0.tar.gz
/qgis-1.8.0.tar.bz2 /qgis-1.8.0.tar.bz2
/qgis-2.0.0.tar.bz2 /qgis-2.0.0.tar.bz2
/qgis-2.0.1.tar.bz2 /qgis-2.0.1.tar.bz2
/qgis-2.2.0.tar.bz2

24
qgis-2.0.1-httplib2.patch
View File

@ -1,24 +0,0 @@
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-28 00:07:27.581240299 +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})
diff -Nur qgis-2.0.1/python/plugins/processing/admintools/geoserver/catalog.py qgis-2.0.1-httplib2/python/plugins/processing/admintools/geoserver/catalog.py
--- qgis-2.0.1/python/plugins/processing/admintools/geoserver/catalog.py 2013-09-11 01:06:52.000000000 +0200
+++ qgis-2.0.1-httplib2/python/plugins/processing/admintools/geoserver/catalog.py 2013-09-28 00:08:25.495356845 +0200
@@ -36,7 +36,7 @@
from xml.etree.ElementTree import XML
from xml.parsers.expat import ExpatError
from urlparse import urlparse
-from processing.admintools import httplib2
+import httplib2
logger = logging.getLogger("gsconfig.catalog")

160
qgis-2.0.1-sip-4.15.patch
View File

@ -1,160 +0,0 @@
diff -ur qgis-2.0.1/python/CMakeLists.txt qgis-2.0.1-sip/python/CMakeLists.txt
--- qgis-2.0.1/python/CMakeLists.txt 2013-09-11 01:06:52.000000000 +0200
+++ qgis-2.0.1-sip/python/CMakeLists.txt 2013-10-19 20:49:29.597349650 +0200
@@ -75,7 +75,7 @@
# core module
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
@@ -90,7 +90,13 @@
# gui module
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)
+
+IF(UNIX AND NOT SIP_VERSION_NUM LESS 265984)
+ SET(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS})
+ ADD_DEFINITIONS(-Dprotected=public)
+ENDIF(UNIX AND NOT SIP_VERSION_NUM LESS 265984)
+
ADD_SIP_PYTHON_MODULE(qgis.gui gui/gui.sip qgis_core qgis_gui)
# additional analysis includes
@@ -113,13 +119,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_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)
Only in qgis-2.0.1-sip/python: CMakeLists.txt.orig
Only in qgis-2.0.1-sip/python: CMakeLists.txt.rej
diff -ur qgis-2.0.1/python/gui/qgsmaptooltouch.sip qgis-2.0.1-sip/python/gui/qgsmaptooltouch.sip
--- qgis-2.0.1/python/gui/qgsmaptooltouch.sip 2013-09-11 01:06:52.000000000 +0200
+++ qgis-2.0.1-sip/python/gui/qgsmaptooltouch.sip 2013-10-19 20:47:47.412374663 +0200
@@ -24,5 +24,7 @@
virtual void canvasDoubleClickEvent( QMouseEvent * e );
virtual bool isTransient();
+
+ bool gestureEvent( QGestureEvent *event );
};
%End
Only in qgis-2.0.1-sip: qgis-2.0.1
diff -ur qgis-2.0.1/src/core/qgsmaplayerregistry.h qgis-2.0.1-sip/src/core/qgsmaplayerregistry.h
--- qgis-2.0.1/src/core/qgsmaplayerregistry.h 2013-09-11 01:06:52.000000000 +0200
+++ qgis-2.0.1-sip/src/core/qgsmaplayerregistry.h 2013-10-19 20:47:47.410374765 +0200
@@ -239,6 +239,11 @@
//! protected constructor
QgsMapLayerRegistry( QObject * parent = 0 );
+ /** debugging member
+ invoked when a connect() is made to this object
+ */
+ void connectNotify( const char * signal );
+
private:
static QgsMapLayerRegistry* mInstance;
@@ -246,10 +251,6 @@
QMap<QString, QgsMapLayer*> mMapLayers;
QSet<QgsMapLayer*> mOwnedLayers;
- /** debugging member
- invoked when a connect() is made to this object
- */
- void connectNotify( const char * signal );
}; // class QgsMapLayerRegistry
diff -ur qgis-2.0.1/src/gui/qgsattributedialog.h qgis-2.0.1-sip/src/gui/qgsattributedialog.h
--- qgis-2.0.1/src/gui/qgsattributedialog.h 2013-09-11 01:06:52.000000000 +0200
+++ qgis-2.0.1-sip/src/gui/qgsattributedialog.h 2013-10-19 20:47:47.410374765 +0200
@@ -59,9 +59,10 @@
void dialogDestroyed();
- private:
+ protected:
bool eventFilter( QObject *obj, QEvent *event );
+ private:
QDialog *mDialog;
QString mSettingsPath;
// Used to sync multiple widgets for the same field
diff -ur qgis-2.0.1/src/gui/qgsmapcanvas.h qgis-2.0.1-sip/src/gui/qgsmapcanvas.h
--- qgis-2.0.1/src/gui/qgsmapcanvas.h 2013-09-11 01:06:52.000000000 +0200
+++ qgis-2.0.1-sip/src/gui/qgsmapcanvas.h 2013-10-19 20:47:47.411374714 +0200
@@ -410,6 +410,11 @@
/// Handle pattern for implementation object
std::auto_ptr<CanvasProperties> mCanvasProperties;
+ /**debugging member
+ invoked when a connect() is made to this object
+ */
+ void connectNotify( const char * signal );
+
private slots:
void crsTransformEnabled( bool );
@@ -459,11 +464,6 @@
the last entry in case a lot of resize events arrive in short time*/
QList< QPair<int, int> > mResizeQueue;
- /**debugging member
- invoked when a connect() is made to this object
- */
- void connectNotify( const char * signal );
-
//! current layer in legend
QgsMapLayer* mCurrentLayer;
diff -ur qgis-2.0.1/src/gui/qgsmaptooltouch.h qgis-2.0.1-sip/src/gui/qgsmaptooltouch.h
--- qgis-2.0.1/src/gui/qgsmaptooltouch.h 2013-09-11 01:06:52.000000000 +0200
+++ qgis-2.0.1-sip/src/gui/qgsmaptooltouch.h 2013-10-19 20:47:47.412374663 +0200
@@ -49,13 +49,14 @@
virtual bool isTransient() { return true; }
+ bool gestureEvent( QGestureEvent *event );
+
private:
//! Flag to indicate a map canvas drag operation is taking place
bool mDragging;
//! Flag to indicate a pinch gesture is taking place
bool mPinching;
- bool gestureEvent( QGestureEvent *event );
void pinchTriggered( QPinchGesture *gesture );
};
diff -ur qgis-2.0.1/src/gui/qgsmessagelogviewer.h qgis-2.0.1-sip/src/gui/qgsmessagelogviewer.h
--- qgis-2.0.1/src/gui/qgsmessagelogviewer.h 2013-09-11 01:06:52.000000000 +0200
+++ qgis-2.0.1-sip/src/gui/qgsmessagelogviewer.h 2013-10-19 20:47:47.411374714 +0200
@@ -42,10 +42,11 @@
public slots:
void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
- private:
+ protected:
void showEvent( QShowEvent * );
void hideEvent( QHideEvent * );
+ private:
QToolButton *mButton;
int mCount;

27
qgis-2.0.1-sip-8601.patch
View File

@ -1,27 +0,0 @@
From 2301c9145afbbbb2f3f31bd751498f9893eabc1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dra=C5=BEen=20Odoba=C5=A1i=C4=87?= <dodobasic@gmail.com>
Date: Sun, 22 Sep 2013 22:41:20 +0200
Subject: [PATCH 3/4] apply #8601
---
python/gui/qgsfieldvalidator.sip | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/python/gui/qgsfieldvalidator.sip b/python/gui/qgsfieldvalidator.sip
index 5d5de30..6237e3e 100644
--- a/python/gui/qgsfieldvalidator.sip
+++ b/python/gui/qgsfieldvalidator.sip
@@ -9,6 +9,8 @@ class QgsFieldValidator : QValidator
QgsFieldValidator( QObject *parent, const QgsField &field, QString dateFormat = "yyyy-MM-dd" );
~QgsFieldValidator();
- virtual State validate( QString &, int & ) const;
- virtual void fixup( QString & ) const;
+ virtual State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /;
+ virtual State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/;
+ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /;
+ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/;
};
--
1.8.1.4

24
qgis-2.2.0-httplib2.patch Normal file
View File

@ -0,0 +1,24 @@
diff -Nur qgis-2.2.0/python/plugins/processing/admintools/CMakeLists.txt qgis-2.2.0-httplib2/python/plugins/processing/admintools/CMakeLists.txt
--- qgis-2.2.0/python/plugins/processing/admintools/CMakeLists.txt 2014-02-22 09:48:47.000000000 +0100
+++ qgis-2.2.0-httplib2/python/plugins/processing/admintools/CMakeLists.txt 2014-02-22 20:37:24.158591564 +0100
@@ -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})
diff -Nur qgis-2.2.0/python/plugins/processing/admintools/geoserver/catalog.py qgis-2.2.0-httplib2/python/plugins/processing/admintools/geoserver/catalog.py
--- qgis-2.2.0/python/plugins/processing/admintools/geoserver/catalog.py 2014-02-22 09:48:47.000000000 +0100
+++ qgis-2.2.0-httplib2/python/plugins/processing/admintools/geoserver/catalog.py 2014-02-22 20:36:11.366380941 +0100
@@ -41,7 +41,7 @@
UnsavedLayerGroup
from processing.admintools.geoserver.workspace import workspace_from_index, \
Workspace
-from processing.admintools import httplib2
+import httplib2
logger = logging.getLogger('gsconfig.catalog')

25
qgis-2.2.0-show-license.patch Normal file
View File

@ -0,0 +1,25 @@
From afd667420a42cb257c6c4524290091663e21f3d6 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Wed, 26 Feb 2014 00:17:54 +0100
Subject: [PATCH] fix license display
---
src/core/qgsapplication.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
index 691bd72..1efd46d 100644
--- a/src/core/qgsapplication.cpp
+++ b/src/core/qgsapplication.cpp
@@ -443,7 +443,7 @@ const QString QgsApplication::translatorsFilePath()
*/
const QString QgsApplication::licenceFilePath()
{
- return ABISYM( mPkgDataPath ) + QString( "/doc/LICENCE" );
+ return ABISYM( mPkgDataPath ) + QString( "/doc/LICENSE" );
}
/*!
--
1.8.5.5

17
qgis-2.0.0-sip410.patch → qgis-2.2.0-sip.patch
View File

@ -1,7 +1,8 @@
diff -Nur qgis-2.0.0/python/CMakeLists.txt qgis-2.0.0-sip410/python/CMakeLists.txt diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
--- qgis-2.0.0/python/CMakeLists.txt 2013-09-09 03:53:04.000000000 +0200 index 044f65e..824ad54 100644
+++ qgis-2.0.0-sip410/python/CMakeLists.txt 2013-09-10 00:20:53.553086242 +0200 --- a/python/CMakeLists.txt
@@ -75,7 +75,7 @@ +++ b/python/CMakeLists.txt
@@ -82,7 +82,7 @@ ENDIF(PYQT4_VERSION_NUM LESS 264196)
# core module # core module
FILE(GLOB_RECURSE sip_files_core core/*.sip) FILE(GLOB_RECURSE sip_files_core core/*.sip)
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core}) SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
@ -10,16 +11,16 @@ diff -Nur qgis-2.0.0/python/CMakeLists.txt qgis-2.0.0-sip410/python/CMakeLists.t
ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core) ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core)
# additional gui includes # additional gui includes
@@ -90,7 +90,7 @@ @@ -97,7 +97,7 @@ INCLUDE_DIRECTORIES(
# gui module # gui module
FILE(GLOB_RECURSE 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_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} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -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 IF(UNIX AND NOT SIP_VERSION_NUM LESS 265984)
@@ -113,13 +113,13 @@ SET(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS})
@@ -126,13 +126,13 @@ FILE(GLOB sip_files_analysis
analysis/interpolation/*.sip analysis/interpolation/*.sip
) )
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis}) SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis})

8
qgis-mime.xml
View File

@ -2,8 +2,8 @@
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
<mime-type type="application/x-qgis-project"> <mime-type type="application/x-qgis-project">
<comment>Quantum GIS Project</comment> <comment>QGIS Project</comment>
<comment xml:lang="de">Quantum GIS-Projekt</comment> <comment xml:lang="de">QGIS-Projekt</comment>
<sub-class-of type="application/xml"/> <sub-class-of type="application/xml"/>
<alias type="application/x-qgis"/> <alias type="application/x-qgis"/>
<magic priority="50"> <magic priority="50">
@ -15,8 +15,8 @@
</mime-type> </mime-type>
<mime-type type="application/x-qgis-layer-settings"> <mime-type type="application/x-qgis-layer-settings">
<comment>Quantum GIS layer settings</comment> <comment>QGIS layer settings</comment>
<comment xml:lang="de">Quantum GIS Layer Einstellungen</comment> <comment xml:lang="de">QGIS Layer Einstellungen</comment>
<sub-class-of type="application/xml"/> <sub-class-of type="application/xml"/>
<magic priority="50"> <magic priority="50">
<match type="string" offset="0" value="&lt;!DOCTYPE qgis"> <match type="string" offset="0" value="&lt;!DOCTYPE qgis">

195
qgis.spec
View File

@ -1,35 +1,35 @@
# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though the soname might stay the same, it won't work anymore. # Shebangs in Python plugin files
#http://hub.qgis.org/issues/5274 # https://hub.qgis.org/issues/9669
# Shared lib calls exit
# https://hub.qgis.org/issues/2854
%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) %if 0%{?rhel} < 6
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif %endif
# libspatialite is present for PPC and PPC64 from F19 on # libspatialite is present for PPC and PPC64 in Fedora and EL7, but not in older EL
%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
%if 0%{?rhel} <= 6
%ifarch ppc ppc64 %ifarch ppc ppc64
%if ! (0%{?fedora} < 19 || 0%{?rhel}) %global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=FALSE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
%endif %endif
%else
%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
%endif %endif
#WITH_GLOBE -- requires osgearth, which is still not packaged
#TODO: Run test suite (see debian/rules) #TODO: Run test suite (see debian/rules)
Name: qgis Name: qgis
Version: 2.0.1 Version: 2.2.0
Release: 8%{?dist} Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
# There are build issues at the moment; working with upstream
ExcludeArch: armv7hl
# Update FSF address or ship a GPLv3+ license file
# http://hub.qgis.org/issues/3789
Group: Applications/Engineering Group: Applications/Engineering
# http://hub.qgis.org/issues/3789
License: GPLv3+ with exceptions License: GPLv3+ with exceptions
URL: http://www.qgis.org URL: http://www.qgis.org
#TODO: There are build issues at the moment
ExcludeArch: armv7hl
Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2
# The used sources were released as a tarball, the below is only for work in progress # The used sources were released as a tarball, the below is only for work in progress
#git archive --format=tar --prefix=qgis-1.8.0/ master | bzip2 >../qgis-1.8.0.tar.gz #git archive --format=tar --prefix=qgis-1.8.0/ master | bzip2 >../qgis-1.8.0.tar.gz
@ -46,28 +46,24 @@ Source5: %{name}-mime.xml
Patch0: %{name}-1.5.0-grass.patch Patch0: %{name}-1.5.0-grass.patch
# Remove httplib2 from the build system # Remove httplib2 from the build system
Patch2: %{name}-2.0.1-httplib2.patch # http://hub.qgis.org/issues/9618
Patch2: %{name}-2.2.0-httplib2.patch
# Compilation failure with sip 4.15
# https://hub.qgis.org/issues/8507
# https://github.com/qgis/QGIS/commit/6734ab443a41b5ab5a730651754d9365cf4eaf04
# 8385386493d3b19223825ce2ac9137d6d079a1c2
# 349a4c974fab88fdda0d612dea8defe037ec50ba
# Drop -o option from SIP, as versions older than 4.10 don't have it # Drop -o option from SIP, as versions older than 4.10 don't have it
Patch3: %{name}-2.0.1-sip-4.15.patch Patch3: %{name}-2.2.0-sip.patch
# sip: QgsFieldValidator::fixup has versioned and unversioned overloads # Show license file from frontend
# https://hub.qgis.org/issues/8601 # https://github.com/qgis/QGIS/commit/afd667420a42cb257c6c4524290091663e21f3d6
Patch4: %{name}-2.0.1-sip-8601.patch Patch4: %{name}-2.2.0-show-license.patch
# Leaving it to make life easier for ELGIS, as long as they target RHEL 5 # Some plug-ins need Pyspatialite (bundled)
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
# TODO: Pyspatialite is included if you use the bundled libspatialite.
# Some plug-ins need it.
# The license is not totally clear, see: # The license is not totally clear, see:
# http://code.google.com/p/pyspatialite/issues/detail?id=3 # http://code.google.com/p/pyspatialite/issues/detail?id=3
# It also is sort of a fork of pysqlite, which is not elegant. # It also is sort of a fork of pysqlite, which is not elegant.
#
# F20 and up instead allow for loadable sqlite extensions in Python:
# https://bugzilla.redhat.com/show_bug.cgi?id=1066708
# https://bugzilla.redhat.com/show_bug.cgi?id=814905
BuildRequires: cmake BuildRequires: cmake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -80,7 +76,7 @@ BuildRequires: grass-devel
BuildRequires: gsl-devel BuildRequires: gsl-devel
%ifarch ppc ppc64 %ifarch ppc ppc64
%if ! (0%{?fedora} < 19 || 0%{?rhel}) %if (0%{?fedora} || 0%{?rhel} > 6)
BuildRequires: libspatialite-devel BuildRequires: libspatialite-devel
%endif %endif
%else %else
@ -92,21 +88,19 @@ BuildRequires: proj-devel
BuildRequires: PyQt4-devel BuildRequires: PyQt4-devel
BuildRequires: PyQwt-devel BuildRequires: PyQwt-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: qextserialport-devel
BuildRequires: qscintilla-devel
BuildRequires: qt4-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: qt4-webkit-devel
BuildRequires: qwt-devel BuildRequires: qwt-devel
BuildRequires: qextserialport-devel
BuildRequires: qwtpolar-devel BuildRequires: qwtpolar-devel
BuildRequires: sip-devel > 4.7 BuildRequires: sip-devel > 4.7
BuildRequires: spatialindex-devel BuildRequires: spatialindex-devel
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
BuildRequires: qscintilla-devel
# Fails to build with QT_MOBILITY
#http://hub.qgis.org/issues/7753
#BuildRequires: qt-mobility-devel
# Enable for tests # Enable for tests
#BuildRequires: xorg-x11-server-Xvfb #BuildRequires: xorg-x11-server-Xvfb
@ -114,7 +108,18 @@ BuildRequires: qscintilla-devel
Requires: gpsbabel Requires: gpsbabel
# We don't want to provide private Python extension libs # We don't want to provide private Python extension libs
%global __provides_exclude_from ^%{python_sitearch}/.*\.so$ %if (0%{?fedora} || 0%{?rhel} > 6)
%global __provides_exclude_from ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%global __requires_exclude_from ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%endif
%if 0%{?rhel} == 6
%{?filter_setup:
%filter_provides_in ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%filter_requires_in ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%filter_setup
}
%endif
%description %description
Geographic Information System (GIS) manages, analyzes, and displays Geographic Information System (GIS) manages, analyzes, and displays
@ -137,8 +142,13 @@ Development packages for Quantum GIS including the C header files.
Summary: GRASS Support Libraries for Quantum GIS Summary: GRASS Support Libraries for Quantum GIS
Group: Applications/Engineering Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
# The plug-in requires more than just the grass-libs. # The plug-in requires more than just the grass-libs.
#TODO: I think, that is still correct, but the sense of the libs package is questionable # This questions the sense of the libs package is questionable
# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though
# the soname might stay the same, it won't work anymore.
#http://hub.qgis.org/issues/5274
Requires: grass = 6.4.3 Requires: grass = 6.4.3
%description grass %description grass
@ -176,10 +186,10 @@ Please refer to %{name}-mapserver-README.fedora for details!
%setup -q %setup -q
%patch0 -p1 -b .grass~ %patch0 -p1 -b .grass~
%patch2 -p1 -b .httplib2~ %patch2 -p1 -b .httplib2~
%patch3 -p1 -b .sip415~ %patch3 -p1 -b .sip~
%patch4 -p1 -b .field_val_overload~ %patch4 -p1 -b .license~
# Readme file for QGIS mapserver configuration and Lighttpd sample # Readme file for QGIS mapserver configuration and Lighttpd example
install -pm0644 %{SOURCE4} . install -pm0644 %{SOURCE4} .
# Delete bundled libs # Delete bundled libs
@ -187,6 +197,13 @@ rm -rf src/core/spatialite
rm -rf src/core/gps/qwtpolar-{0.1,1.0} rm -rf src/core/gps/qwtpolar-{0.1,1.0}
rm -rf src/core/gps/qextserialport rm -rf src/core/gps/qextserialport
rm -rf python/plugins/processing/admintools/httplib2 rm -rf python/plugins/processing/admintools/httplib2
rm -rf python/pyspatialite
# Remove shebang from processing plug-in files
# https://hub.qgis.org/issues/9669
sed -i '1d' python/plugins/processing/saga/{SagaDescriptionCreator.py,SagaHelpGenerator.py}
gzip ChangeLog
%build %build
@ -199,14 +216,12 @@ rm -rf python/plugins/processing/admintools/httplib2
%{_cmake_skip_rpath} \ %{_cmake_skip_rpath} \
-D QGIS_LIB_SUBDIR=%{_lib} \ -D QGIS_LIB_SUBDIR=%{_lib} \
-D QGIS_MANUAL_SUBDIR=/share/man \ -D QGIS_MANUAL_SUBDIR=/share/man \
-D QGIS_PLUGIN_SUBDIR=%{_lib}/%{name} \
-D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
-D WITH_BINDINGS:BOOL=TRUE \ -D WITH_BINDINGS:BOOL=TRUE \
-D MAPSERVER_SKIP_ECW=TRUE \
-D GRASS_PREFIX=%{_libdir}/grass \ -D GRASS_PREFIX=%{_libdir}/grass \
-D WITH_MAPSERVER:BOOL=TRUE \ -D WITH_MAPSERVER:BOOL=TRUE \
-D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \ -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
-D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
-D GDAL_LIBRARY=%{_libdir}/libgdal.so \
-D ENABLE_TESTS:BOOL=FALSE \ -D ENABLE_TESTS:BOOL=FALSE \
-D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \ -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
-D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \ -D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
@ -215,6 +230,9 @@ rm -rf python/plugins/processing/admintools/httplib2
%{configure_with_spatialite} \ %{configure_with_spatialite} \
. .
#-D WITH_QTMOBILITY:BOOL=TRUE \ #-D WITH_QTMOBILITY:BOOL=TRUE \
# Doesn't build, see above!
#-D WITH_GLOBE:BOOL=TRUE
# Globe requires osgearth, which is still not packaged
make %{?_smp_mflags} make %{?_smp_mflags}
@ -222,15 +240,11 @@ make %{?_smp_mflags}
%install %install
# Necessary for the test suite # Necessary for the test suite
#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib} #export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib}
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
# Add executable perms to python libs so they get stripped
chmod +x %{buildroot}%{python_sitearch}/%{name}/*.so
# Install desktop file without connecting proprietary file types # Install desktop file without connecting proprietary file types
desktop-file-install \ desktop-file-install \
%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) %if (0%{?rhel} && 0%{?rhel} < 7)
--vendor="fedora" \ --vendor="fedora" \
%endif %endif
--remove-mime-type="application/x-raster-ecw" \ --remove-mime-type="application/x-raster-ecw" \
@ -276,19 +290,11 @@ install -pm0644 %{SOURCE2} \
rm -f %{buildroot}%{_libexecdir}/%{name}/wms_metadata.xml rm -f %{buildroot}%{_libexecdir}/%{name}/wms_metadata.xml
rm -f %{buildroot}%{_libexecdir}/%{name}/admin.sld rm -f %{buildroot}%{_libexecdir}/%{name}/admin.sld
# Remove files packaged by doc # Remove install instructions
pushd %{buildroot}%{_datadir}/%{name}/doc rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL
rm -f BUGS \
CHANGELOG \
CODING \
COPYING \
INSTALL \
PROVENANCE \
README
popd
# Name of locale is wrong # Name of locale is wrong
#mv %{buildroot}/usr/share/qgis/i18n/qgis_sr-Latn.qm \ #mv %{buildroot}/usr/share/qgis/i18n/qgis_sr_Latn.qm \
#%{buildroot}/usr/share/qgis/i18n/qgis_sr@latin.qm #%{buildroot}/usr/share/qgis/i18n/qgis_sr@latin.qm
%find_lang %{name} --with-qt %find_lang %{name} --with-qt
@ -301,10 +307,6 @@ popd
#rm -f %{_bindir}%{name}_bench #rm -f %{_bindir}%{name}_bench
%clean
rm -rf %{buildroot}
%post %post
/sbin/ldconfig /sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@ -331,13 +333,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%postun python -p /sbin/ldconfig %postun python -p /sbin/ldconfig
%files -f %{name}.lang %files -f %{name}.lang
#TODO: Encoding problem on the help page %doc NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz
# CONTRIBUTORS and AUTHORS are intended be viewed in the About-Box # QGIS shows the following files in the GUI, including the license text
# ChangeLog is 4 MB, therefore don't ship it %doc %{_datadir}/%{name}/doc/
%doc BUGS NEWS CODING COPYING Exception_to_GPL_for_Qt.txt PROVENANCE README
# QGIS shows these files in the GUI
%{_datadir}/%{name}/doc
%dir %{_datadir}/%{name}/i18n/ %dir %{_datadir}/%{name}/i18n/
%if 0%{?rhel} %if 0%{?rhel}
%lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm %lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm
@ -347,7 +345,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/lib%{name}_gui.so.* %{_libdir}/lib%{name}_gui.so.*
%{_libdir}/lib%{name}sqlanyconnection.so.* %{_libdir}/lib%{name}sqlanyconnection.so.*
%{_libdir}/lib%{name}_networkanalysis.so.* %{_libdir}/lib%{name}_networkanalysis.so.*
%{_libdir}/%{name} %{_libdir}/%{name}/
%{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so %{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so
%{_bindir}/%{name} %{_bindir}/%{name}
%{_bindir}/qbrowser %{_bindir}/qbrowser
@ -362,27 +360,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/scalable/apps/%{name}-icon.svg %{_datadir}/icons/hicolor/scalable/apps/%{name}-icon.svg
%{_datadir}/applications/*%{name}.desktop %{_datadir}/applications/*%{name}.desktop
%{_datadir}/applications/qbrowser.desktop %{_datadir}/applications/qbrowser.desktop
%{_datadir}/%{name}/images %{_datadir}/%{name}/images/
%{_datadir}/%{name}/resources %{_datadir}/%{name}/resources/
%{_datadir}/%{name}/svg %{_datadir}/%{name}/svg/
%exclude %{_libdir}/libqgisgrass.so.* %exclude %{_libdir}/libqgisgrass.so.*
%exclude %{_libdir}/%{name}/libgrassprovider.so %exclude %{_libdir}/%{name}/plugins/libgrassprovider.so
%exclude %{_libdir}/%{name}/libgrassrasterprovider.so %exclude %{_libdir}/%{name}/plugins/libgrassrasterprovider.so
%exclude %{_libdir}/%{name}/libgrassplugin.so %exclude %{_libdir}/%{name}/plugins/libgrassplugin.so
%exclude %{_libdir}/%{name}/grass %exclude %{_libdir}/%{name}/plugins/libgrass_gis.*.so*
%exclude %{_libdir}/%{name}/grass/
%files devel %files devel
%{_datadir}/%{name}/FindQGIS.cmake %{_datadir}/%{name}/FindQGIS.cmake
%{_includedir}/%{name} %{_includedir}/%{name}/
%{_libdir}/lib%{name}*.so %{_libdir}/lib%{name}*.so
%files grass %files grass
%{_libdir}/lib%{name}grass.so.* %{_libdir}/lib%{name}grass.so.*
%{_libdir}/%{name}/libgrassprovider.so %{_libdir}/%{name}/plugins/libgrassprovider.so
%{_libdir}/%{name}/libgrassrasterprovider.so %{_libdir}/%{name}/plugins/libgrass_gis.*.so*
%{_libdir}/%{name}/libgrassplugin.so %{_libdir}/%{name}/plugins/libgrassrasterprovider.so
%{_libdir}/%{name}/grass %{_libdir}/%{name}/plugins/libgrassplugin.so
%{_datadir}/%{name}/grass %{_libdir}/%{name}/grass/
%{_datadir}/%{name}/grass/
%files python %files python
%{_libdir}/libqgispython.so.* %{_libdir}/libqgispython.so.*
@ -392,9 +392,22 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files mapserver %files mapserver
%doc src/mapserver/admin.sld src/mapserver/wms_metadata.xml %{name}-mapserver-README.fedora %doc src/mapserver/admin.sld src/mapserver/wms_metadata.xml %{name}-mapserver-README.fedora
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-mapserver.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-mapserver.conf
%{_libexecdir}/%{name} %{_libexecdir}/%{name}/
%changelog %changelog
* Sat Feb 22 2014 Volker Fröhlich <volker27@gmx.at> - 2.2.0-1
- New upstream release
- Fix the issue of the license text not being shown in the GUI
- Drop EL5 support leftovers
- Remove private provides
- Remove unnecessary explicit paths for GDAL
- Simplify conditionals
- Remove custom plugin directory setting
- Delete bundled Pyspatialite
- Compress changelog file
- Simplify documentation labeling
* Fri Feb 07 2014 Volker Fröhlich <volker27@gmx.at> - 2.0.1-8 * Fri Feb 07 2014 Volker Fröhlich <volker27@gmx.at> - 2.0.1-8
- Rebuild for minor ABI breakage in spatialindex 1.8.1 - Rebuild for minor ABI breakage in spatialindex 1.8.1

2
sources
View File

@ -1 +1 @@
3822c7dd70e2d893a0f1baa9c72316d2 qgis-2.0.1.tar.bz2 0390e50c8a38c6cbef1720fc11aeabe6 qgis-2.2.0.tar.bz2