74 Commits

Author SHA1 Message Date
81e67d2ced Force server to be TRUE 2017-09-30 17:52:19 +02:00
5f79adb3dd Fix GRASS7 prefix 2017-09-30 17:46:28 +02:00
0a3b30fb8b Provide qextserialport sources 2017-09-30 15:36:54 +02:00
fd8a74c506 Fix a missing backslash 2017-09-30 15:23:08 +02:00
7e5f3b08e4 Use flags 2017-09-30 15:09:35 +02:00
c8713a51bb Put python dependencies 2017-09-30 14:59:15 +02:00
99fc5f927d First QGIS 2.99 commit 2017-09-28 12:39:04 +02:00
2ec248640a Merge branch 'daniviga-2.18.3' of dani/copr-dani-qgis into daniviga-2.18 2017-09-28 10:07:18 +00:00
c32ec1ab33 Bump to 2.18.13 2017-09-25 15:33:54 +02:00
f5ce81f06d Merge branch 'pyhton2-saga' of dani/copr-dani-qgis into daniviga-2.18 2017-08-29 07:45:26 +00:00
2d2df9d258 Merge branch 'daniviga-2.18.12' of dani/copr-dani-qgis into daniviga-2.18 2017-08-29 07:25:35 +00:00
8192a026ed Python 2 binary package renamed to python2-saga 2017-08-29 09:25:01 +02:00
7e7cb97e5c Sync with upstream master 2017-08-28 21:39:11 +02:00
654373f227 Bump to 2.18.12 2017-08-28 15:16:08 +02:00
8b738f8d6d Merge branch 'daniviga-2.18.11' of dani/copr-dani-qgis into daniviga-2.18 2017-08-28 13:08:39 +00:00
0c5424710b Bump to 2.18.11 2017-07-25 09:59:10 +02:00
d5e00f3862 Merge branch 'daniviga-2.18-sync' of dani/copr-dani-qgis into daniviga-2.18 2017-07-18 09:29:41 +00:00
d675da6614 Sync with upstream Fedora repo 2017-07-18 09:00:59 +02:00
Volker Fröhlich
35f3eec274 Rebuild for Grass 7.2 2017-06-29 22:32:50 +02:00
Sandro Mani
776b1c79e9 Drop unnecessary qgis-2.18.10-sip.patch 2017-06-29 16:28:54 +02:00
70962865be Merge branch 'saga' of dani/copr-dani-qgis into daniviga-2.18 2017-06-29 14:18:17 +00:00
9f3657e4cd Update source 2017-06-29 16:18:04 +02:00
d9f2400b79 Add saga sources since QGIS 2.18 requires SAGA 2.3 2017-06-29 16:06:28 +02:00
Volker Fröhlich
ed258f8422 Merge branch 'master' into f26 2017-06-28 08:50:39 +02:00
ae8c708993 Merge branch 'daniviga-2.18.10' of dani/copr-dani-qgis into daniviga-2.18 2017-06-26 19:06:53 +00:00
Sandro Mani
20e8b1f938 Merge branch 'master' into f26 2017-06-26 16:43:32 +02:00
44cfc3ff15 Limit maximum number of concurrent make 2017-06-26 16:21:13 +02:00
af86e34bfb Fix an issue in the QGIS server httpd configuration 2017-06-26 15:15:38 +02:00
c50785bbcf Update to 2.18.10 2017-06-26 15:14:39 +02:00
Volker Fröhlich
9b753f950b Merge branch 'master' into f26 2017-06-02 01:01:28 +02:00
85377ab326 Sip patch isn't needed by F27 anymore 2017-05-30 14:07:30 +02:00
0c29f7a825 Remove an old comment 2017-05-30 13:02:28 +02:00
6ce112f37a Merge branch 'daniviga-2.18.9' of dani/copr-dani-qgis into daniviga-2.18 2017-05-30 08:56:26 +00:00
f86dd2bbce Update to 2.18.9 2017-05-29 07:45:39 +02:00
97ae9b6237 Merge branch 'daniviga-2.18.8' of dani/copr-dani-qgis into daniviga-2.18 2017-05-23 08:44:33 +00:00
d1079c008f Update to 2.18.7 2017-05-22 16:18:10 +02:00
Volker Fröhlich
23aed9fd0c New version 2.18.8 2017-05-19 22:58:11 +02:00
aeee828e3f Merge branch 'daniviga-2.18.7' of dani/copr-dani-qgis into daniviga-2.18 2017-04-26 19:39:57 +00:00
bca62e751d New upstream release 2017-04-26 17:15:02 +02:00
68428bc219 Update changelog 2017-04-09 14:26:03 +02:00
66ec016fab Apply sip patch only on Fedora >= 26 2017-04-09 14:01:00 +02:00
441611c62e Merge branch 'daniviga-2.18-f26' into daniviga-2.18 2017-04-09 13:00:28 +02:00
426022bd63 Merge branch 'daniviga-2.18.6' of dani/copr-dani-qgis into daniviga-2.18 2017-04-09 10:29:57 +00:00
15c15d9274 Merge branch 'daniviga-2.18.6' into daniviga-2.18-f26 2017-04-09 12:23:25 +02:00
0508d7eb0d Update to 2.18.6 2017-04-09 11:26:33 +02:00
4d41f88e5a Remove outdatet patch code 2017-04-07 12:17:45 +02:00
3521cf407f Import FTBFS patch for F26 build 2017-04-07 12:09:31 +02:00
82347897a9 Sync spec with upstream master 2017-04-07 11:03:46 +02:00
561f119f6a Update and cleanup .gitignore 2017-03-28 09:55:19 +02:00
a719107bd0 Merge branch 'daniviga-2.18.5' of dani/copr-dani-qgis into daniviga-2.18 2017-03-28 07:52:45 +00:00
48f3e5b53c Update to 2.18.5 2017-03-27 17:15:01 +02:00
00e035dc38 Merge branch 'daniviga-2.18.4' of dani/copr-dani-qgis into daniviga-2.18 2017-03-03 07:44:22 +00:00
67ee830c7d Update to 2.18.4 2017-03-02 21:59:10 +01:00
3f79929f94 Merge branch 'daniviga-2.18.3' of dani/copr-dani-qgis into daniviga-2.18 2017-02-06 13:33:52 +00:00
463859c7a0 Bump to 2.18.3 2017-02-01 17:20:01 +01:00
4e92650402 Merge branch 'master' into daniviga-2.18 2016-12-23 09:03:44 +01:00
fd60ac752f Delete unused patch 2016-10-27 21:15:41 +02:00
5f50e99082 Merge branch 'master' into daniviga-2.18 2016-10-27 19:26:56 +02:00
f5435260f5 Fix grass dep. version 2016-09-27 10:40:54 +02:00
65393eec96 Add patch backported from master 2016-09-27 10:40:27 +02:00
f591293686 Update spec for 2.16.3 and sync with master 2016-09-27 09:58:06 +02:00
fc322ff7e1 Update to release 2.16.1 2016-08-23 21:23:48 +02:00
c90cf6775a Merge branch 'f24' into daniviga-2.16 2016-08-23 21:16:06 +02:00
Volker Froehlich
5853bf16a5 Fix dependency on PyQt4-webkit (BZ #1360485) 2016-08-11 09:37:28 +02:00
5f6628f6e8 Update gitignore, remove old patches 2016-07-17 15:35:46 +02:00
339777385f Update sources for 2.16.0 2016-07-17 15:34:52 +02:00
efadeabd79 Missing qca-ossl in requirements
See:
https://hub.qgis.org/issues/14651
2016-07-17 15:31:52 +02:00
e8d46fdfe9 Make spec backward compatible with F23 2016-07-17 15:24:01 +02:00
e72d15977c Upgrade to upstream release 2.16.0 on F24 2016-07-17 15:23:25 +02:00
Volker Fröhlich
da2c96706d Correct Grass version for F24 2016-06-07 01:23:16 +02:00
Devrim Gündüz
54805f2d68 Sync with rawhide spec. 2016-06-06 17:38:07 +03:00
Volker Fröhlich
392b1a2812 Correct version number 2016-05-25 01:29:53 +02:00
Volker Fröhlich
615a219f4b Merge branch 'master' into f24 2016-05-25 01:27:07 +02:00
Volker Fröhlich
7d85f1dcf5 Remove requires-filtering, masking a dependency for libgsl 2016-03-17 02:05:10 +01:00
9 changed files with 392 additions and 666 deletions

40
.gitignore vendored
View File

@@ -1,39 +1 @@
qgis_1.5.0.tar.gz
/qgis_1.6.0.tar.gz
/qgis-1.7.0.tar.bz2
/qgis-1.7.1.tar.bz2
/qgis-1.7.2.tar.bz2
/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
/qgis-2.2.0.tar.bz2
/qgis-2.4.0.tar.bz2
/qgis-2.6.0.tar.bz2
/qgis-2.6.1.tar.bz2
/qgis-2.8.1.tar.bz2
/qgis-2.8.2.tar.bz2
/qgis-2.10.0.tar.bz2
/qgis-2.10.1.tar.bz2
/qgis-2.12.0.tar.bz2
/qgis-2.12.1.tar.bz2
/qgis-2.12.2.tar.bz2
/qgis-2.12.3.tar.bz2
/qgis-2.14.0.tar.bz2
/qgis-2.14.1.tar.bz2
/qgis-2.14.3.tar.bz2
/qgis-2.16.2.tar.bz2
/qgis-2.16.3.tar.bz2
/qgis-2.18.0.tar.bz2
/qgis-2.18.1.tar.bz2
/qgis-2.18.2.tar.bz2
/qgis-2.18.4.tar.bz2
/qgis-2.18.5.tar.bz2
/qgis-2.18.6.tar.bz2
/qgis-2.18.7.tar.bz2
/qgis-2.18.8.tar.bz2
/qgis-2.18.9.tar.bz2
/qgis-2.18.10.tar.bz2
/qgis-2.18.11.tar.bz2
/qgis-2.18.12.tar.bz2
/*.tar.bz2

View File

@@ -1,18 +0,0 @@
commit 91171370514b558ea7f0ae34af7503ddb31d68e6
Author: Juergen E. Fischer <jef@norbit.de>
Date: Sun Aug 20 10:51:52 2017 +0200
remove sip workaround (fixes #17038, refs #16071)
diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip
index f9b7854..464952d 100644
--- a/python/core/qgscoordinatetransform.sip
+++ b/python/core/qgscoordinatetransform.sip
@@ -15,7 +15,6 @@
class QgsCoordinateTransform : QObject
{
%TypeHeaderCode
-extern PyObject *sipExportedExceptions__core[2]; // workaround: sipExportedExceptions__core is only defined in the first sip part
#include <qgscoordinatetransform.h>
%End

View File

@@ -1,13 +0,0 @@
diff -up qgis-2.16.2/CMakeLists.txt.lib64 qgis-2.16.2/CMakeLists.txt
diff -up qgis-2.16.2/cmake/PyQtMacros.cmake.lib64 qgis-2.16.2/cmake/PyQtMacros.cmake
--- qgis-2.16.2/cmake/PyQtMacros.cmake.lib64 2016-08-26 05:58:37.000000000 -0600
+++ qgis-2.16.2/cmake/PyQtMacros.cmake 2016-09-21 16:25:55.921411011 -0600
@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles )
ELSE(WIN32)
# TODO osx
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
ENDIF(WIN32)
FOREACH(it ${ARGN})

View File

@@ -2,7 +2,7 @@
# It is not meant for productive use.
RewriteEngine on
RewriteRule ^/wms/(.+)$ /qgis/qgis_mapserv.fcgi?map=/var/www/wms/$1.qgs [QSA,PT]
RewriteRule ^/wms/(.*)$ /qgis/qgis_mapserv.fcgi?map=/var/www/wms/$1.qgs [QSA,PT]
ScriptAlias /qgis/ "/usr/libexec/qgis/"

671
qgis.spec
View File

@@ -1,32 +1,15 @@
#TODO: Fix error message with processing plug-in in regards to pyspatialite
# Shared lib calls exit
# https://hub.qgis.org/issues/2854
# 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
%if (0%{?rhel} <= 6 && !0%{?fedora})
%ifarch ppc ppc64
%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=FALSE
%endif
%endif
#TODO: Run test suite (see debian/rules)
Name: qgis
Version: 2.18.12
Version: 2.99
Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
# http://hub.qgis.org/issues/3789
License: GPLv3+ with exceptions
URL: http://www.qgis.org
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
#git archive --format=tar --prefix=qgis-1.8.0/ master | bzip2 >../qgis-1.8.0.tar.gz
# Sample configuration files for QGIS server
Source2: %{name}-server-httpd.conf
@@ -35,84 +18,72 @@ Source4: %{name}-server-README.fedora
# MIME definitions
# Based on debian/qgis.xml but excluding already defined or proprietary types
Source5: %{name}-mime.xml
# Fix builds on 64-bit machines
# https://hub.qgis.org/issues/15602
# https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
Patch0: %{name}-lib64.patch
Patch1: %{name}-2.18.12-pyobject-redefined.patch
# Some plug-ins need Pyspatialite (bundled)
# The license is not totally clear, see:
# http://code.google.com/p/pyspatialite/issues/detail?id=3
# 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
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
BuildRequires: fcgi-devel
BuildRequires: flex bison
BuildRequires: gdal-devel
BuildRequires: geos-devel
BuildRequires: grass-devel
BuildRequires: gsl-devel
# Compling stuff
BuildRequires: bison
BuildRequires: clang
BuildRequires: cmake
BuildRequires: expat-devel
BuildRequires: flex
BuildRequires: desktop-file-utils
%ifarch ppc ppc64
%if (0%{?fedora} || 0%{?rhel} > 6)
BuildRequires: libspatialite-devel
%endif
%else
BuildRequires: libspatialite-devel
%endif
# Geo stuff
BuildRequires: gdal-devel
BuildRequires: gdal-python3
BuildRequires: geos-devel
BuildRequires: gsl-devel
BuildRequires: libspatialite-devel
BuildRequires: proj-devel
BuildRequires: spatialindex-devel
BuildRequires: postgresql-devel
BuildRequires: proj-devel
BuildRequires: PyQt4-devel
# PyQwt doesn't support qwt6, so just turn it off for now on RHEL
%if 0%{?fedora} < 26
BuildRequires: PyQwt-devel
%endif
BuildRequires: python2-devel
# qca2 is a virtual provides of qca. Put here to make things easier for EPEL!
BuildRequires: qca2-devel
BuildRequires: qextserialport-devel
BuildRequires: qjson-devel
BuildRequires: qscintilla-devel
BuildRequires: qscintilla-python
BuildRequires: qscintilla-python-devel
BuildRequires: qt4-devel
#BuildRequires: qt-mobility-devel
BuildRequires: qt4-webkit-devel
BuildRequires: qwt-devel
BuildRequires: qwtpolar-devel
BuildRequires: sip-devel > 4.7
BuildRequires: spatialindex-devel
BuildRequires: sqlite-devel
# Other stuff
BuildRequires: gsl-devel
BuildRequires: libzip-devel
BuildRequires: postgresql-devel
BuildRequires: sqlite-devel
BuildRequires: fcgi-devel
# Fails to build with QT_MOBILITY
#http://hub.qgis.org/issues/7753
#BuildRequires: qt-mobility-devel
# Python stuff
BuildRequires: python3-future
BuildRequires: python3-jinja2
BuildRequires: python3-OWSLib
BuildRequires: python3-psycopg2
BuildRequires: python3-pygments
BuildRequires: python3-PyYAML
BuildRequires: python3-qscintilla-devel
BuildRequires: python3-qscintilla-qt5
BuildRequires: python3-qscintilla-qt5-devel
BuildRequires: python3-qt5-devel
BuildRequires: sip-devel
# Enable for tests
#BuildRequires: xorg-x11-server-Xvfb
# Qca stuff
BuildRequires: qca-qt5-devel
BuildRequires: qca-qt5-ossl
BuildRequires: qscintilla-qt5-devel
# Qt5 stuff
BuildRequires: qt5-qtlocation-devel
BuildRequires: qt5-qtscript-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qttools-static
BuildRequires: qt5-qtwebkit-devel
BuildRequires: qt5-qtxmlpatterns-devel
BuildRequires: qtkeychain-qt5-devel
# Qwt stuff
BuildRequires: qwt-devel
BuildRequires: qwt-qt5-devel
BuildRequires: qwt-qt5-devel
Requires: gpsbabel
# As found in BZ#1396818
Requires: qca-ossl
# We don't want to provide private Python extension libs
%if (0%{?fedora} || 0%{?rhel} > 6)
%global __provides_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_setup
}
%endif
%description
Geographic Information System (GIS) manages, analyzes, and displays
@@ -146,8 +117,8 @@ Requires: grass%{?_isa} = %{grass_version}
%description grass
GRASS plugin for QGIS required to interface with the GRASS system.
%package -n python2-qgis
%{?python_provide:%python_provide python2-qgis}
%package -n python3-qgis
%{?python_provide:%python_provide python3-qgis}
# Remove before F30
Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
@@ -155,20 +126,19 @@ Obsoletes: %{name}-python < %{version}-%{release}
Summary: Python integration and plug-ins for QGIS
Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: gdal-python
Requires: PyQt4-webkit
Requires: python-httplib2
Requires: python-jinja2
Requires: python-matplotlib
Requires: python-OWSLib
Requires: python-psycopg2
Requires: python-pygments
Requires: python-six
Requires: PyYAML
Requires: qscintilla-python
Requires: gdal-python3
Requires: python3-future
Requires: python3-jinja2
Requires: python3-OWSLib
Requires: python3-psycopg2
Requires: python3-pygments
Requires: python3-PyYAML
Requires: python3-qscintilla
Requires: python3-qscintilla-qt5
Requires: python3-qt5
%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
%description -n python2-qgis
%description -n python3-qgis
Python integration and plug-ins for QGIS.
%package server
@@ -189,12 +159,6 @@ Please refer to %{name}-server-README.fedora for details!
%prep
%setup -q
%patch0 -p1 -b .lib64
# Solve "error: conflicting declaration 'PyObject* sipExportedExceptions__core [3]'"
# https://issues.qgis.org/projects/qgis/repository/revisions/91171370514b558ea7f0ae34af7503ddb31d68e6
# https://issues.qgis.org/projects/qgis/repository/revisions/91171370514b558ea7f0ae34af7503ddb31d68e6/diff/python/core/qgscoordinatetransform.sip?format=diff
%patch1 -p1 -b .pyobject
# Remove executable permissions from source code files
find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
@@ -203,61 +167,31 @@ find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {
install -pm0644 %{SOURCE4} .
# Delete bundled libs
rm -rf src/core/spatialite/
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/ext-libs/!(CMakeLists.txt|tests)"
rm -rf src/plugins/dxf2shp_converter/
sed -i '/dxf2shp_converter/d' src/plugins/CMakeLists.txt
gzip ChangeLog
%build
# Necessary for the test suite
#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib}
#TODO: If for EPEL (osgearth, touch)
#Info: TOUCH needs Qt >= 4.5
%cmake \
%{_cmake_skip_rpath} \
-D QGIS_LIB_SUBDIR=%{_lib} \
-D QGIS_MANUAL_SUBDIR=/share/man \
-D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
-D WITH_BINDINGS:BOOL=TRUE \
-D WITH_GRASS:BOOL=TRUE \
-D WITH_GRASS7:BOOL=TRUE \
-D GRASS_PREFIX=%{_libdir}/grass \
-D GRASS_PREFIX7=%{_libdir}/grass \
-D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
-D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
-D ENABLE_TESTS:BOOL=FALSE \
-D WITH_INTERNAL_DATEUTIL:BOOL=FALSE \
-D WITH_INTERNAL_HTTPLIB2:BOOL=FALSE \
-D WITH_INTERNAL_JINJA2:BOOL=FALSE \
-D WITH_INTERNAL_MARKUPSAFE:BOOL=FALSE \
-D WITH_INTERNAL_OWSLIB:BOOL=FALSE \
-D WITH_INTERNAL_PYGMENTS:BOOL=FALSE \
-D WITH_INTERNAL_PYTZ:BOOL=FALSE \
-D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
-D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
-D WITH_INTERNAL_SIX:BOOL=FALSE \
-D WITH_INTERNAL_YAML:BOOL=FALSE \
-D WITH_PYSPATIALITE:BOOL=FALSE \
-D QEXTSERIALPORT_INCLUDE_DIR:STRING=%{_includedir}/QtExtSerialPort \
-D WITH_QSPATIALITE:BOOL=TRUE \
-D WITH_SERVER:BOOL=TRUE \
-D WITH_TOUCH:BOOL=TRUE \
%{configure_with_spatialite} \
.
#-D WITH_QTMOBILITY:BOOL=TRUE \
# Doesn't build, as of 2.10, known issue
#-D WITH_GLOBE:BOOL=TRUE
# Parallel build appears to occasionally result in build failures
# (UI form headers generated too late)
# TODO: Re-check with QGIS-3.0
make
make %{?_smp_mflags}
%install
@@ -267,17 +201,12 @@ make install DESTDIR=%{buildroot}
# Install desktop file without connecting proprietary file types
desktop-file-install \
%if (0%{?rhel} && 0%{?rhel} < 7)
--vendor="fedora" \
%endif
--remove-mime-type="application/x-raster-ecw" \
--remove-mime-type="application/x-raster-mrsid" \
--dir=%{buildroot}%{_datadir}/applications \
debian/qgis.desktop
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
debian/qbrowser.desktop
# Install MIME type definitions
install -d %{buildroot}%{_datadir}/mime/packages
install -pm0644 %{SOURCE5} \
@@ -287,7 +216,6 @@ install -pm0644 %{SOURCE5} \
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/apps
install -pm0644 debian/%{name}-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/qgis.png
install -pm0644 debian/qbrowser-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/qbrowser.png
done
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128; do
@@ -299,12 +227,9 @@ install -pd %{buildroot}%{_datadir}/pixmaps
install -pd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
install -pm0644 images/icons/%{name}-icon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -pm0644 images/icons/qbrowser-icon.png %{buildroot}%{_datadir}/pixmaps/qbrowser.png
install -pm0644 images/icons/%{name}-mime-icon.png %{buildroot}%{_datadir}/pixmaps/%{name}-mime.png
install -pm0644 images/icons/%{name}_icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
install -pm0644 images/icons/qbrowser_icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/qbrowser.svg
install -pm0644 images/icons/%{name}_icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg
install -pm0644 images/icons/qbrowser_icon.svg %{buildroot}%{_datadir}/pixmaps/qbrowser.svg
# Install basic QGIS Mapserver configuration for Apache
install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d
@@ -321,13 +246,6 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL
%find_lang %{name} --with-qt
%check
# All tests basically run fine, but one fails using mock, while a different one fails when building with rpmbuild alone
#export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
#xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" make Experimental
#rm -f %{_bindir}%{name}_bench
%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -350,9 +268,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%postun grass -p /sbin/ldconfig
%post -n python2-qgis -p /sbin/ldconfig
%post -n python3-qgis -p /sbin/ldconfig
%postun -n python2-qgis -p /sbin/ldconfig
%postun -n python3-qgis -p /sbin/ldconfig
%files -f %{name}.lang
%doc BUGS NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz
@@ -367,18 +285,15 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_libdir}/lib%{name}_gui.so.*
%{_libdir}/lib%{name}_networkanalysis.so.*
%{_libdir}/%{name}/
%{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so
%{_qt5_prefix}/plugins/sqldrivers/libqsqlspatialite.so
%{_bindir}/%{name}
%{_bindir}/qbrowser
%{_mandir}/man1/%{name}.1*
%{_mandir}/man1/qbrowser.1*
%dir %{_datadir}/%{name}/
%{_datadir}/mime/packages/qgis.xml
%{_datadir}/pixmaps/
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/icons/hicolor/*/mimetypes/*
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/applications/qbrowser.desktop
%{_datadir}/%{name}/images/
%{_datadir}/%{name}/resources/
%{_datadir}/%{name}/svg/
@@ -392,7 +307,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_datadir}/%{name}/FindQGIS.cmake
%{_includedir}/%{name}/
%{_libdir}/lib%{name}*.so
%{?_qt4_plugindir}/designer/libqgis_customwidgets.so*
%{?_qt5_plugindir}/designer/libqgis_customwidgets.so*
%files grass
%{_libdir}/lib%{name}grass*.so.*
@@ -402,11 +317,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_libdir}/%{name}/grass/
%{_datadir}/%{name}/grass/
%files -n python2-qgis
%files -n python3-qgis
%{_libdir}/libqgispython.so.*
%{_datadir}/%{name}/python/
%{python_sitearch}/%{name}/
%{python_sitearch}/PyQt4/uic/widget-plugins/
%{python_sitearch}/PyQt/uic/widget-plugins/
%exclude %{python_sitearch}/%{name}/server/
%exclude %{python_sitearch}/%{name}/_server.so
@@ -420,437 +335,5 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Tue Aug 22 2017 Volker Froehlich <volker27@gmx.at> - 2.18.12-1
- New upstream release
- Add patch to solve SIP-4.19-related build failure
* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.18.11-4
- Python 2 binary package renamed to python2-qgis
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Jul 22 2017 Volker Froehlich <volker27@gmx.at> - 2.18.11-1
- New upstream release
* Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 2.18.10-7
- Rebuild due to bug in RPM (RHBZ #1468476)
* Thu Jul 06 2017 Rex Dieter <rdieter@fedoraproject.org> - 2.18.10-6
- rebuild (sip)
* Mon Jul 03 2017 Sandro Mani <manisandro@gmail.com> - 2.18.10-5
- Bump release for NVR parity with F26
* Thu Jun 29 2017 Sandro Mani <manisandro@gmail.com> - 2.18.10-4
- Drop unnecessary qgis-2.18.10-sip.patch
* Wed Jun 28 2017 Volker Froehlich <volker27@gmx.at> - 2.18.10-3
- Add patch to fix sip issues
* Mon Jun 26 2017 Sandro Mani <manisandro@gmail.com> - 2.18.10-2
- Disable parallel build for now to avoid build failures
* Sat Jun 24 2017 Volker Froehlich <volker27@gmx.at> - 2.18.10-1
- New upstream release
* Wed May 31 2017 Volker Froehlich <volker27@gmx.at> - 2.18.9-1
- New upstream release
* Fri May 19 2017 Volker Froehlich <volker27@gmx.at> - 2.18.8-1
- New upstream release
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.18.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
* Sun Apr 23 2017 Volker Froehlich <volker27@gmx.at> - 2.18.7-1
- New upstream release
* Fri Apr 07 2017 Volker Froehlich <volker27@gmx.at> - 2.18.6-1
- New upstream release
* Sat Mar 25 2017 Volker Froehlich <volker27@gmx.at> - 2.18.5-1
- New upstream release
* Wed Mar 01 2017 Sandro Mani <manisandro@gmail.com> - 2.18.4-2
- Add patch to fix FTBFS
* Fri Feb 24 2017 Volker Froehlich <volker27@gmx.at> - 2.18.4-1
- New upstream release
* Mon Feb 20 2017 Rex Dieter <rdieter@fedoraproject.org> - 2.18.2-5
- rebuild (qscintilla)
* Tue Feb 14 2017 Volker Froehlich <volker27@gmx.at> - 2.18.2-4
- Apply build patch for SIP 4.19 (#16071)
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sun Jan 01 2017 Rex Dieter <rdieter@math.unl.edu> - 2.18.2-2
- rebuild (sip), disable PyQwt support (f26+, for now)
* Fri Dec 16 2016 Volker Froehlich <volker27@gmx.at> - 2.18.2-1
- New upstream release
* Sat Nov 26 2016 Volker Froehlich <volker27@gmx.at> - 2.18.1-1
- New upstream release
* Sun Nov 20 2016 Volker Froehlich <volker27@gmx.at> - 2.18.0-2
- Add qca-ossl to Requires, as of BZ#1396818
* Fri Oct 21 2016 Volker Froehlich <volker27@gmx.at> - 2.18.0-1
- New upstream release
* Mon Sep 26 2016 Orion Poplawski <orion@cora.nwra.com> - 2.16.3-1
- Update to 2.16.3
- Add patch to fix qreal usage on arm
* Mon Sep 26 2016 Orion Poplawski <orion@cora.nwra.com> - 2.16.2-1
- Update to 2.16.2 (bug #1378240)
- Add patch to fix build on 64-bit machines
- Drop unused cmake options
- Move %%grass_version macro to grass-devel, make it an install requirement
* Mon Sep 26 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.14.3-6
- rebuilt for matplotlib-2.0.0
* Thu Aug 11 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-5
- Replace dependency on PyQt4 with PyQt4-webkit, since webkit
is in a sub-package now (BZ #1360485)
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.14.3-4
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Tue Jun 07 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-3
- Version bump to be newer than F24
* Mon Jun 06 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-2
- Move grass version to BR. This will avoid building with a
different version than intended. The sub-package dependencies
is taken care of by soname versions.
* Mon May 23 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-1
- New upstream release
* Wed Apr 20 2016 Volker Froehlich <volker27@gmx.at> - 2.14.1-2
- Change BR of qca to qca2 to make things easier in EPEL
- Rebuild for BZ #1327360
- Make the requires on grass match an exact version again
* Sun Mar 27 2016 Volker Froehlich <volker27@gmx.at> - 2.14.1-1
- New upstream release
- Resolve the false sub-package dependency of python on server
* Fri Mar 25 2016 Devrim Gündüz <devrim@gunduz.org> - 2.14.0-5
- Depend exclusively against GRASS => 7.0.3
* Thu Mar 17 2016 Devrim Gündüz <devrim@gunduz.org> - 2.14.0-4
- Rebuild for GRASS 7.0.3
* Wed Mar 16 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-3
- Build with Grass 7
- Remove Requires-filtering, hiding the dependency on libgsl
* Wed Mar 9 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-2
- Add patch for upstream issue #14402 (MSSQL)
* Sat Feb 27 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-1
- New upstream release
- Add PyYAML as BR and disable the use of the bundled version
- Be more explicit about the supported version of grass
- Install proper icons (BZ #1166977)
- Break the dependency of the base package on the python sub-package
- Add a new locale not found by find_lang
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sat Jan 23 2016 Volker Froehlich <volker27@gmx.at> - 2.12.3-1
- New upstream release
* Sat Dec 19 2015 Volker Froehlich <volker27@gmx.at> - 2.12.2-1
- New upstream release
* Fri Nov 27 2015 Volker Froehlich <volker27@gmx.at> - 2.12.1-1
- New upstream release
* Mon Oct 26 2015 Volker Froehlich <volker27@gmx.at> - 2.12.0-2
- Fix ARM build
* Sat Oct 24 2015 Volker Froehlich <volker27@gmx.at> - 2.12.0-1
- New upstream release
- Add qca BR
* Sun Jul 26 2015 Volker Froehlich <volker27@gmx.at> - 2.10.1-3
- Correct conditionals for spatialite support on PPC and Fedora
(Thanks to Rafael Fonseca)
* Sun Jul 26 2015 Volker Froehlich <volker27@gmx.at> - 2.10.1-2
- Rebuild for GDAL 2.0
* Tue Jul 21 2015 Volker Fröhlich <volker27@gmx.at> - 2.10.1-1
- New upstream release
* Wed Jul 8 2015 Volker Fröhlich <volker27@gmx.at> - 2.10.0-1
- New upstream release
- Drop obsolete Grass CMake patch
- Add ARM build fix; Thanks again, Sandro Mani!
- Truncate the changelog a bit
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Jun 3 2015 Volker Fröhlich <volker27@gmx.at> - 2.8.2-1
- New upstream release
* Mon Apr 20 2015 Rex Dieter <rdieter@fedoraproject.org> 2.8.1-4
- rebuild (qscintilla)
* Wed Mar 11 2015 Devrim GÜNDÜZ <devrim@gunduz.org> - 2.8.1-3
- Rebuild for Proj 4.9.1
* Mon Mar 9 2015 Volker Fröhlich <volker27@gmx.at> - 2.8.1-2
- Add upstream patch to fix the build on ARM
* Sun Mar 8 2015 Volker Fröhlich <volker27@gmx.at> - 2.8.1-1
- New upstream release, remove included patch change
- Rename mapserver sub-package to server
- Add a new locale not found by find_lang
- Partly solve the icon file naming issue (BZ#1166977)
* Thu Feb 19 2015 Dave Johansen <davejohansen@gmail.com> 2.6.1-2
- Rebuild for gcc 5.0 C++ ABI change
* Fri Jan 2 2015 Dave Johansen <davejohansen@gmail.com> - 2.6.1-1
- Update to 2.6.1
* Sun Nov 2 2014 Volker Fröhlich <volker27@gmx.at> - 2.6.0-2
- Fix the build on ARMv7hl, thanks to Sandro Mani!
- Updated the removing of executable permissions from source code files
- Add qscintilla-python-devel as BR
- Don't build the dxf converter plug-in
- Remove the Python directory definitions that were necessary on EL5
* Sun Nov 2 2014 Volker Fröhlich <volker27@gmx.at> - 2.6.0-1
- New upstream release, drop obsolete patch, update the sip patch
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Tue Aug 12 2014 Rex Dieter <rdieter@fedoraproject.org> 2.4.0-6
- update mime scriptlet
* Sun Aug 10 2014 Devrim GÜNDÜZ <devrim@gunduz.org> - 2.4.0-5
- Rebuild against new grass
* Sat Aug 9 2014 Volker Fröhlich <volker27@gmx.at> - 2.4.0-4
- Rebuild for grass 6.4.4
* Mon Jul 28 2014 Volker Fröhlich <volker27@gmx.at> - 2.4.0-3
- Restore ARM build (Thanks to Sandro Mani for the patch!)
* Fri Jul 25 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.4.0-2
- rebuild (libspatialite)
* Sat Jun 28 2014 Volker Fröhlich <volker27@gmx.at> - 2.4.0-1
- New upstream release, drop obsolete patches, update remaining
- Remove references to "Quantum"
- Add CODING and BUGS file
- Add necessary direct Python module dependencies
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri Mar 28 2014 Volker Fröhlich <volker27@gmx.at> - 2.2.0-3
- ARM build fix
* Sun Mar 16 2014 Rex Dieter <rdieter@fedoraproject.org> 2.2.0-2
- rebuild (sip)
* 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
- Rebuild for minor ABI breakage in spatialindex 1.8.1
* Wed Dec 25 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-7
- Python sub-package must require psycopg2 for the Processing plug-in
(BZ #1043683)
* Fri Nov 08 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-6
- Rebuild for new qwt and qwtpolar
* Sat Oct 19 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-5
- Patch QGIS #8507 -- QGIS trunk failed to compile with sip 4.15
- Patch QGIS #8601 -- sip: QgsFieldValidator::fixup has versioned and
unversioned overloads
* Wed Oct 16 2013 Rex Dieter <rdieter@fedoraproject.org> 2.0.1-4
- rebuild (sip)
* Tue Oct 1 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-3
- Fix Grass version to make breakage more visible
* Fri Sep 27 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-2
- Remove import path for httplib2 module to use the system version
- Use upstream desktop files
* Wed Sep 25 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.1-1
- New upstream release
- Exclude ARM for now, due to build issues
* Sat Sep 14 2013 Volker Fröhlich <volker27@gmx.at> - 1.8.0-17
- Rebuild for grass 6.4.3
* Tue Aug 27 2013 Orion Poplawski <orion@cora.nwra.com> - 1.8.0-16
- Rebuild for gdal 1.10.0
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Mon Jun 17 2013 Rex Dieter <rdieter@fedoraproject.org> 1.8.0-14
- rebuild (sip)
* Fri Feb 22 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 1.8.0-13
- Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sat Dec 15 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-11
- Rebuild for spatialindex soname bump
* Sun Dec 2 2012 Bruno Wolff III <bruno@wolff.to> - 1.8.0-10
- Rebuild for libspatialite soname bump
* Thu Nov 8 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-9
- Build with system version of qextserialport
- Update config file to fit httpd 2.4 (BZ#871471)
* Wed Oct 03 2012 Rex Dieter <rdieter@fedoraproject.org> 1.8.0-8
- rebuild (sip)
* Thu Aug 9 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-7
- Append ppc to ppc64 conditionals
* Wed Jul 18 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-6
- Add patch for QGIS bug #5809
* Sat Jul 7 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-5
- Rebuilt too quick
* Sat Jul 7 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-4
- One more rebuild, due to a broken GDAL
* Fri Jul 6 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-3
- Rebuild for Spatialite 3
* Thu Jul 5 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-2
- Correct locale if clause
- Apply patch for older versions of SIP
* Fri Jun 29 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-1
- New upstream release
- Correct provides-filtering as of https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Usage
- Drop obsolete spatialindex patch
- FSF addresses are now correct
- Explicitly set PYSPATIALITE to false
- Don't ship the 4 MB changelog
- Use wildcard for soname versions
* Tue Apr 10 2012 Volker Fröhlich <volker27@gmx.at> - 1.7.4-4
- Been to quick with rebuilding, proper spatialindex build wasn't used yet
* Mon Apr 9 2012 Volker Fröhlich <volker27@gmx.at> - 1.7.4-3
- Apply patch for Spatialindex 1.7's include dir
- Rebuild for Spatialindex 1.7.1
* Fri Mar 23 2012 Volker Fröhlich <volker27@gmx.at> - 1.7.4-2
- Rebuild for GRASS 6.4.2
* Sun Feb 19 2012 Volker Fröhlich <volker27@gmx.at> - 1.7.4-1
- Update for new release
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Sat Dec 10 2011 Volker Fröhlich <volker27@gmx.at> - 1.7.3-1
- Update for new release
- Is also the rebuild for BZ#761147
- Arch-specifically require the base package
* Tue Nov 15 2011 Volker Fröhlich <volker27@gmx.at> - 1.7.2-1
- Updated for new release
- No more themes directory
- Remove dispensable geo-referencing patch
* Sun Oct 16 2011 Volker Fröhlich <volker27@gmx.at> - 1.7.1-2
- Findlang doesn't recognize sr@latin in Fedora 14 and older
- Build with system-wide spatialindex
- Remove if structures intended for EPEL package
Due to the rapid development in QGIS and the libraries it uses,
QGIS will not go to EPEL now; ELGIS provides rebuilds with more
current versions: http://elgis.argeo.org/
* Sat Sep 24 2011 Volker Fröhlich <volker27@gmx.at> - 1.7.1-1
- Update for new release
- Drop one patch that made it into the release
- Correct permissions for two cpp files
- Change spelling for changelog file
- Findlang seems to find sr@latin now, so don't explicitly list it
- Build with Qwtpolar
- Remove grass as BR
- Add GRASS_PREFIX again
Cmake uses the first entry in FindGRASS.cmake,
which is not fine for 64 bit systems
* Sun Jul 24 2011 Volker Fröhlich <volker27@gmx.at> - 1.7.0-5
- Extend histogram patch, see BZ 725161
* Wed Jul 06 2011 Volker Fröhlich <volker27@gmx.at> - 1.7.0-4
- Remove icon path macros, that don't work in EPEL
- Avoid creating unnecessary directories there
- Be explicit about the shared lib names in the files section
- Put libqgispython.so.1.7.0 in Python sub-package
- Correct FSF address
* Wed Jul 06 2011 Volker Fröhlich <volker27@gmx.at> - 1.7.0-3
- Withdraw immature Lighty configuration
- Update README and provide a better sample configuration,
that utilizes mod_rewrite
* Sun Jun 26 2011 Volker Fröhlich <volker27@gmx.at> - 1.7.0-2
- Add histogram patch
- Add scriplets to refresh icon cache
- Mention Fedora specific readme file in QGIS mapserver description
- Update the aforementioned file and the Apache configuration
with rewrite rules
* Sun Jun 26 2011 Volker Fröhlich <volker27@gmx.at> - 1.7.0-1
- Update for 1.7
- License is now GPLv3+ (Sqlanyconnect)
- Add mapserver sub-package and require mod_fcgi
- Use upstreams current description text
- Drop now needless iconv
- Rename new Serbian translations
- Install MIME type definitions and icons
- Add Readme file and sample configuration for Mapserver
- Add patch to avoid segfault when geo-referencing
- Add conditional for Spatialite and PPC64
- Add conditional for GRASS and EPEL
- Delete bundled libspatialite before building
- Removed glob from /usr/bin/qgis in files section
* Thu Sep 28 2017 Daniele Viganò <daniele@vigano.me> - 2.99-1
- Unstable build

1
saga/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
saga_2.3.1_gpl2.tar.gz

311
saga/saga.spec Normal file
View File

@@ -0,0 +1,311 @@
Name: saga
Version: 2.3.1
Release: 2%{?dist}
Summary: Geographic information system with an API for processing geodata
Group: Applications/Engineering
# libsaga_api is licensed under the terms of LGPLv2. So is one single
# module and some of the code to create documentation.
# The rest of the code is GPLv2, GPLv2+ or compatible (ISC, MIT/X11)
License: GPLv2 and LGPLv2
URL: http://www.saga-gis.org
#Source0: https://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.3/SAGA%20%{version}/saga_%{version}_gpl2.tar.gz
Source0: %{name}_%{version}_gpl2.tar.gz
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
BuildRequires: libtool automake autoconf
BuildRequires: e00compr-static
BuildRequires: gdal-devel
BuildRequires: jasper-devel
BuildRequires: libharu-devel
BuildRequires: libsvm-devel
BuildRequires: libtiff-devel
BuildRequires: polyclipping-devel
BuildRequires: proj-devel
BuildRequires: postgresql-devel
BuildRequires: python2-devel
BuildRequires: qhull-devel
BuildRequires: swig
BuildRequires: unixODBC-devel
#BuildRequires: vigra-devel
BuildRequires: wxGTK3-devel
%description
SAGA is a geographic information system (GIS) with a special API
for geographic data processing. This API makes it easy to implement
new algorithms. The SAGA API supports grid data, vector data, and tables.
%package -n python2-saga
%{?python_provide:%python_provide python2-saga}
# Remove before F30
Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
Summary: SAGA Python interface
Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python2-saga
Python interface for SAGA
%package devel
Summary: SAGA development package
Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This package includes the headers and development libraries for SAGA.
# We don't want to provide private Python extension libs
# This approach only works with rpm 4.9
# See https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Usage and https://fedorahosted.org/fpc/ticket/76
#TODO: Check if provides are proper
%global __provides_exclude_from ^%{python_sitearch}/.*\.so$
%global __provides_requires_from ^%{python_sitearch}/.*\.so$
%prep
%setup -q -n %{name}-%{version}
# Convert to UNIX line-breaks
sed -i 's/\r//' AUTHORS
gzip -c ChangeLog > ChangeLog.gz
%if 0%{?fedora} > 24
# Installation directory has changed
sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \
src/modules/grid/grid_gridding/nn/delaunay.c
%endif
%build
# wxGTK3 3.0.1-3 moved wx-config to libexecdir
PATH=$PATH:%{_libexecdir}/wxGTK3/
autoreconf -fi
#TODO: openmp?
# Build without non-free components
%configure \
--disable-static \
--enable-python \
--disable-libfire \
--disable-triangle
# Get rid of undesirable hardcoded rpaths; workaround libtool reordering
# -Wl,--as-needed after all the libraries.
sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
-e 's|^LTCC="gcc"|LTCC="gcc -Wl,--as-needed"|' \
-e 's|^CC="g++"|CC="g++ -Wl,--as-needed"|' \
-i libtool
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
# Drop libtool archives
rm -rf %{buildroot}/%{_libdir}/saga/lib*.la \
%{buildroot}/%{_libdir}/saga/libsaga_*.la
rm -rf %{buildroot}/%{python_sitearch}/*.la \
%{buildroot}/%{_libdir}/*.la
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
%files
%doc AUTHORS COPYING README
%{_bindir}/%{name}_cmd
%{_bindir}/%{name}_gui
%{_libdir}/%{name}/
%{_datadir}/%{name}/
# No soname versioning is yet in place and the interfaces are not stable
%{_libdir}/lib%{name}_api-%{version}.so
%{_libdir}/lib%{name}_gdi-%{version}.so
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/appdata/%{name}.appdata.xml
%{_mandir}/man1/%{name}_*1*
%files -n python2-saga
%{python_sitearch}/*.py*
%{python_sitearch}/*.so
%files devel
%{_includedir}/%{name}/
%{_libdir}/lib%{name}_api.so
%{_libdir}/lib%{name}_gdi.so
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%changelog
* Tue Aug 29 2017 Daniele Viganò <daniele@vigano.me> - 2.3.1-2
- Sync with upstream master
- Python 2 binary package renamed to python2-saga
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
* Thu Jun 29 2017 Daniele Viganò <daniele@vigano.me> - 2.3.1-1
- Update to SAGA 2.3.1 (with some non-free components disabled)
* Tue Feb 21 2017 Volker Froehlich <volker27@gmx.at> - 2.2.7-3
- Temporarily remove vigra support, due to build failure
* Tue Jan 31 2017 Volker Froehlich <volker27@gmx.at> - 2.2.7-2
- Rebuild for libproj
* Fri Oct 14 2016 Volker Froehlich <volker27@gmx.at> - 2.2.7-1
- New upstream release
- Add new icons to file list
- Add svm patch from Ubuntugis
- Remove references to g2clib
* Thu Oct 13 2016 Volker Froehlich <volker27@gmx.at> - 2.2.4-4
- Rebuild for polyclipping 6.4
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.4-3
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Fri Apr 29 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.2.4-2
- Rebuild for qhull-2015.2-1.
- Reflect qhull_a.h's location having changed.
* Sat Mar 12 2016 Volker Froehlich <volker27@gmx.at> - 2.2.4-1
- New upstream release
- Use the new build options to get rid of triangle, libfire and grib2c
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Oct 16 2015 Volker Froehlich <volker27@gmx.at> - 2.2.2-1
- New upstream release
* Fri Sep 25 2015 Volker Froehlich <volker27@gmx.at> - 2.2.1-1
- New upstream release
* Sun Jul 26 2015 Volker Froehlich <volker27@gmx.at> - 2.2.0-2
- Rebuild for GDAL 2.0
* Sat Jul 4 2015 Volker Froehlich <volker27@gmx.at> - 2.2.0-1
- New upstream version
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.1.4-4
- Rebuilt for GCC 5 C++11 ABI change
* Thu Mar 26 2015 Orion Poplawski <orion@cora.nwra.com> - 2.1.4-3
- Fix up removing bundled source
* Sat Mar 14 2015 Volker Froehlich <volker27@gmx.at> - 2.1.4-2
- Rebuild for Proj 4.1.9
* Fri Nov 14 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.4-1
- New upstream release
- Update dxflib patch
* Fri Oct 31 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.3-1
- New upstream release
- Remove ChangeLog, as it is not updated, ship README instead
- Add and validate appdata file
- Remove format patch (solved upstream)
* Wed Oct 22 2014 Volker Froehlich <volker27@gmx.at> - 2.1.2-5
- Rebuild for polyclipping 6.2.0
* Tue Oct 14 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.2-4
- Adapt package to new file layout in wxGTK3 3.0.1-3 (F22)
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Thu May 15 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.2-1
- New upstream release
* Thu Feb 13 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.1-1
- New upstream release
- Compress changelog file
- Adjust to using wxGTK3, thus drop propgrid dependency as it is included
- Drop outdated build options
- Adapt to polyclipping 6.1 API
- Add BR for postgresql-devel
- Drop custom desktop file and use png icon
- Remove odbc headers from devel package, as discussed with Volker Wichmann
- Add complementary requires-filtering
* Sat Jan 18 2014 Volker Fröhlich <volker27@gmx.at> - 2.0.8-14
- Use safe printing format, solve BZ #1037315 and upstream bug #163
- Add patch for vigra 1.10.0 (upstream bug #173)
* Tue Aug 27 2013 Orion Poplawski <orion@cora.nwra.com> - 2.0.8-13
- Rebuild for gdal 1.10.0
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Mon Jun 24 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.8-11
- Rebuild for polyclipping 5.1.6
* Mon Mar 4 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.8-10
- Rebuild for polyclipping 5.1.2
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Tue Jan 8 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.8-8
- Rebuild for polyclipping
* Wed Dec 26 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-7
- Rebuild for polyclipping
* Fri Nov 23 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-6
- Rebuild for polyclipping
* Fri Oct 19 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-5
- Correct isa macros
- No later versions of GPL and LGPL are allowed
- Break down licenses
- Solve the rpath issue differently
- Rename patches and change numbering
* Tue Oct 9 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-4
- Remove draft patch breaking the build
* Sun Oct 7 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-3
- Replace provides-filtering with a suitable method
- Replace dos2unix invocation with sed
* Thu Apr 12 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-2
- Build with system-wide wxpropgrid and polyclipping
- Correct Exec entry in the desktop file
- Update patch for e00compr
* Thu Nov 24 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.8-1
- Updated for new version
- Drop obsolete patches gcc46 and python-parallel
- Correct tarball script
- Update and correct linking in g2clib patch
* Sun Oct 30 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.7-3
- Delete dxflib from tarball
- Split patches for dxflib and e00compr
- Use bundled wxpropgrid for the time being
- Use system-wide e00compr
* Fri Oct 07 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.7-2
- Correct g2clib patch to actually use g2clib
- Only link to libraries actually used
- Fix configure.in to really search for lodbc
- Require g2clib-static instead of -devel
* Fri Sep 09 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.7-1
- Initital package

1
saga/sources Normal file
View File

@@ -0,0 +1 @@
SHA512 (saga_2.3.1_gpl2.tar.gz) = 5036c6049e0d02b473f8c778aa44adfe769faa8504c3455f86e0b8d8f0ad831801fa2e5073eac786fbd1fc5a64157a0c8981fb551ab36136e2228cf0397d5079

View File

@@ -1 +0,0 @@
SHA512 (qgis-2.18.12.tar.bz2) = e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea