Compare commits
2 Commits
daniviga-2
...
grass74
| Author | SHA1 | Date | |
|---|---|---|---|
| ea80d3c0cb | |||
| 1a2905d7c8 |
28
.gitignore
vendored
28
.gitignore
vendored
|
|
@ -1,11 +1,17 @@
|
|||
/qgis-2.18.17.tar.bz2
|
||||
/qgis-2.18.18.tar.bz2
|
||||
/qgis-2.18.19.tar.bz2
|
||||
/qgis-2.18.20.tar.bz2
|
||||
/qgis-2.18.21.tar.bz2
|
||||
/qgis-2.18.22.tar.bz2
|
||||
/qgis-2.18.23.tar.bz2
|
||||
/qgis-2.18.24.tar.bz2
|
||||
/qgis-2.18.25.tar.bz2
|
||||
/qgis-2.18.27.tar.bz2
|
||||
/qgis-2.18.28.tar.bz2
|
||||
/qgis-2.18.0.tar.bz2
|
||||
/qgis-2.18.1.tar.bz2
|
||||
/qgis-2.18.2.tar.bz2
|
||||
/qgis-2.18.3.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
|
||||
/qgis-2.18.13.tar.bz2
|
||||
/qgis-2.18.14.tar.bz2
|
||||
/qgis-2.18.15.tar.bz2
|
||||
/qgis-2.18.16.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,45 +0,0 @@
|
|||
diff -rupN qgis-2.18.20/src/plugins/grass/scripts/db.connect-login.pg.py qgis-2.18.20-new/src/plugins/grass/scripts/db.connect-login.pg.py
|
||||
--- qgis-2.18.20/src/plugins/grass/scripts/db.connect-login.pg.py 2018-05-18 14:01:08.000000000 +0200
|
||||
+++ qgis-2.18.20-new/src/plugins/grass/scripts/db.connect-login.pg.py 2018-11-02 13:24:02.276460662 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
diff -rupN qgis-2.18.20/src/plugins/grass/scripts/qgis.v.kernel.rast.py qgis-2.18.20-new/src/plugins/grass/scripts/qgis.v.kernel.rast.py
|
||||
--- qgis-2.18.20/src/plugins/grass/scripts/qgis.v.kernel.rast.py 2018-05-18 14:01:08.000000000 +0200
|
||||
+++ qgis-2.18.20-new/src/plugins/grass/scripts/qgis.v.kernel.rast.py 2018-11-02 13:24:00.489411796 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
diff -rupN qgis-2.18.20/src/plugins/grass/scripts/qgis.v.upgrade.py qgis-2.18.20-new/src/plugins/grass/scripts/qgis.v.upgrade.py
|
||||
--- qgis-2.18.20/src/plugins/grass/scripts/qgis.v.upgrade.py 2018-05-18 14:01:08.000000000 +0200
|
||||
+++ qgis-2.18.20-new/src/plugins/grass/scripts/qgis.v.upgrade.py 2018-11-02 13:23:58.663361863 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
diff -rupN qgis-2.18.20/src/plugins/grass/scripts/r.external.all.py qgis-2.18.20-new/src/plugins/grass/scripts/r.external.all.py
|
||||
--- qgis-2.18.20/src/plugins/grass/scripts/r.external.all.py 2018-05-18 14:01:08.000000000 +0200
|
||||
+++ qgis-2.18.20-new/src/plugins/grass/scripts/r.external.all.py 2018-11-02 13:23:56.175293827 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
diff -rupN qgis-2.18.20/src/plugins/grass/scripts/v.out.ogr.pg.py qgis-2.18.20-new/src/plugins/grass/scripts/v.out.ogr.pg.py
|
||||
--- qgis-2.18.20/src/plugins/grass/scripts/v.out.ogr.pg.py 2018-05-18 14:01:08.000000000 +0200
|
||||
+++ qgis-2.18.20-new/src/plugins/grass/scripts/v.out.ogr.pg.py 2018-11-02 13:23:54.063236074 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
diff -rupN qgis-2.18.20/python/PyQt/PyQt4/QtCore.py qgis-2.18.20-new/python/PyQt/PyQt4/QtCore.py
|
||||
--- qgis-2.18.20/python/PyQt/PyQt4/QtCore.py 2018-05-18 14:01:08.000000000 +0200
|
||||
+++ qgis-2.18.20-new/python/PyQt/PyQt4/QtCore.py 2018-11-01 22:07:20.597278848 +0100
|
||||
@@ -23,7 +23,7 @@ __copyright__ = '(C) 2015, Matthias Kuhn
|
||||
# This will get replaced with a git SHA1 when you do a git archive
|
||||
__revision__ = '$Format:%H$'
|
||||
|
||||
-import sip
|
||||
+import PyQt4.sip as sip
|
||||
for api in ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]:
|
||||
sip.setapi(api, 2)
|
||||
|
||||
diff -rupN qgis-2.18.20/python/PyQt/PyQt4/uic/pyuic.py qgis-2.18.20-new/python/PyQt/PyQt4/uic/pyuic.py
|
||||
--- qgis-2.18.20/python/PyQt/PyQt4/uic/pyuic.py 2018-05-18 14:01:08.000000000 +0200
|
||||
+++ qgis-2.18.20-new/python/PyQt/PyQt4/uic/pyuic.py 2018-11-01 22:07:15.417251277 +0100
|
||||
@@ -24,7 +24,7 @@ __copyright__ = '(C) 2016, Jürgen E. Fi
|
||||
__revision__ = '$Format:%H$'
|
||||
|
||||
|
||||
-import sip
|
||||
+import PyQt4.sip as sip
|
||||
for api in ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]:
|
||||
sip.setapi(api, 2)
|
||||
|
||||
diff -rupN qgis-2.18.20/src/python/qgspythonutilsimpl.cpp qgis-2.18.20-new/src/python/qgspythonutilsimpl.cpp
|
||||
--- qgis-2.18.20/src/python/qgspythonutilsimpl.cpp 2018-05-18 14:01:08.000000000 +0200
|
||||
+++ qgis-2.18.20-new/src/python/qgspythonutilsimpl.cpp 2018-11-01 22:07:08.002211865 +0100
|
||||
@@ -122,7 +122,7 @@ bool QgsPythonUtilsImpl::checkSystemImpo
|
||||
runString( "sys.path = [" + newpaths.join( "," ) + "] + sys.path" );
|
||||
|
||||
// import SIP
|
||||
- if ( !runString( "import sip",
|
||||
+ if ( !runString( "import PyQt4.sip as sip",
|
||||
QObject::tr( "Couldn't load SIP module." ) + '\n' + QObject::tr( "Python support will be disabled." ) ) )
|
||||
{
|
||||
return false;
|
||||
diff -rupN qgis-2.18.20/tests/src/python/test_qgsmaplayerregistry.py qgis-2.18.20-new/tests/src/python/test_qgsmaplayerregistry.py
|
||||
--- qgis-2.18.20/tests/src/python/test_qgsmaplayerregistry.py 2018-05-18 14:01:08.000000000 +0200
|
||||
+++ qgis-2.18.20-new/tests/src/python/test_qgsmaplayerregistry.py 2018-11-01 22:06:59.632167456 +0100
|
||||
@@ -15,7 +15,7 @@ __revision__ = '$Format:%H$'
|
||||
from qgis.core import QgsMapLayerRegistry, QgsVectorLayer, QgsMapLayer
|
||||
from qgis.testing import start_app, unittest
|
||||
from qgis.PyQt.QtCore import QT_VERSION_STR
|
||||
-import sip
|
||||
+import PyQt4.sip as sip
|
||||
|
||||
try:
|
||||
from qgis.PyQt.QtTest import QSignalSpy
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
diff -rupN qgis-2.18.25/cmake/PyQtMacros.cmake qgis-2.18.25-new/cmake/PyQtMacros.cmake
|
||||
--- qgis-2.18.25/cmake/PyQtMacros.cmake 2018-10-26 13:59:08.000000000 +0200
|
||||
+++ qgis-2.18.25-new/cmake/PyQtMacros.cmake 2018-11-14 00:15:36.247074662 +0100
|
||||
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
|
||||
|
|
|
|||
112
qgis.spec
112
qgis.spec
|
|
@ -1,7 +1,3 @@
|
|||
# This package depends on automagic byte compilation
|
||||
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
|
||||
%global _python_bytecompile_extra 1
|
||||
|
||||
#TODO: Fix error message with processing plug-in in regards to pyspatialite
|
||||
|
||||
# Shared lib calls exit
|
||||
|
|
@ -15,18 +11,13 @@
|
|||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 27
|
||||
%define grass grass74
|
||||
%else
|
||||
%define grass grass72
|
||||
%endif
|
||||
|
||||
#TODO: Run test suite (see debian/rules)
|
||||
|
||||
Name: qgis
|
||||
Version: 2.18.28
|
||||
Release: 1%{?dist}
|
||||
Version: 2.18.16
|
||||
Release: 2%{?dist}
|
||||
Summary: A user friendly Open Source Geographic Information System
|
||||
Group: Applications/Engineering
|
||||
|
||||
# http://hub.qgis.org/issues/3789
|
||||
License: GPLv3+ with exceptions
|
||||
|
|
@ -45,14 +36,9 @@ Source4: %{name}-server-README.fedora
|
|||
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
|
||||
|
||||
# Fix sip import for namespaced sip
|
||||
Patch1: %{name}-2.18.20-sip.patch
|
||||
|
||||
# Fix grass scripts shebangs
|
||||
Patch2: %{name}-2.18.20-grass.patch
|
||||
|
||||
# Some plug-ins need Pyspatialite (bundled)
|
||||
# The license is not totally clear, see:
|
||||
# http://code.google.com/p/pyspatialite/issues/detail?id=3
|
||||
|
|
@ -79,7 +65,7 @@ BuildRequires: libspatialite-devel
|
|||
BuildRequires: libspatialite-devel
|
||||
%endif
|
||||
|
||||
BuildRequires: libpq-devel
|
||||
BuildRequires: postgresql-devel
|
||||
BuildRequires: proj-devel
|
||||
BuildRequires: PyQt4-devel
|
||||
# PyQwt doesn't support qwt6, so just turn it off for now on RHEL
|
||||
|
|
@ -92,8 +78,8 @@ BuildRequires: qca2-devel
|
|||
BuildRequires: qextserialport-devel
|
||||
BuildRequires: qjson-devel
|
||||
BuildRequires: qscintilla-devel
|
||||
BuildRequires: python2-qscintilla
|
||||
BuildRequires: python2-qscintilla-devel
|
||||
BuildRequires: qscintilla-python
|
||||
BuildRequires: qscintilla-python-devel
|
||||
BuildRequires: qt4-devel
|
||||
#BuildRequires: qt-mobility-devel
|
||||
BuildRequires: qt4-webkit-devel
|
||||
|
|
@ -116,7 +102,7 @@ Requires: qca-ossl
|
|||
|
||||
# We don't want to provide private Python extension libs
|
||||
%if (0%{?fedora} || 0%{?rhel} > 6)
|
||||
%global __provides_exclude_from ^(%{python2_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
|
||||
%global __provides_exclude_from ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} == 6
|
||||
|
|
@ -137,6 +123,7 @@ and USGS ASCII DEM.
|
|||
|
||||
%package devel
|
||||
Summary: Development Libraries for the QGIS
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
|
|
@ -144,6 +131,7 @@ Development packages for QGIS including the C header files.
|
|||
|
||||
%package grass
|
||||
Summary: GRASS Support Libraries for QGIS
|
||||
Group: Applications/Engineering
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
# The plug-in requires more than just the grass-libs.
|
||||
|
|
@ -163,18 +151,19 @@ Provides: %{name}-python = %{version}-%{release}
|
|||
Provides: %{name}-python%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name}-python < %{version}-%{release}
|
||||
Summary: Python integration and plug-ins for QGIS
|
||||
Group: Applications/Engineering
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: python2-gdal
|
||||
Requires: gdal-python
|
||||
Requires: PyQt4-webkit
|
||||
Requires: python2-httplib2
|
||||
Requires: python2-jinja2
|
||||
Requires: python2-matplotlib
|
||||
Requires: python2-owslib
|
||||
Requires: python2-psycopg2
|
||||
Requires: python2-pygments
|
||||
Requires: python2-six
|
||||
Requires: python2-pyyaml
|
||||
Requires: python2-qscintilla
|
||||
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
|
||||
%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
|
||||
|
||||
%description -n python2-qgis
|
||||
|
|
@ -182,6 +171,7 @@ Python integration and plug-ins for QGIS.
|
|||
|
||||
%package server
|
||||
Summary: FCGI-based OGC web map server
|
||||
Group: Applications/Engineering
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: mod_fcgid
|
||||
Provides: mapserver = %{version}-%{release}
|
||||
|
|
@ -198,8 +188,6 @@ Please refer to %{name}-server-README.fedora for details!
|
|||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .lib64
|
||||
%patch1 -p1 -b .sip
|
||||
%patch2 -p1 -b .grass
|
||||
|
||||
# Remove executable permissions from source code files
|
||||
find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
|
||||
|
|
@ -233,8 +221,9 @@ gzip ChangeLog
|
|||
-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_PREFIX7=%{_libdir}/%{grass} \
|
||||
-D GRASS_PREFIX=%{_libdir}/grass-7.4.0 \
|
||||
-D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
|
||||
-D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
|
||||
-D ENABLE_TESTS:BOOL=FALSE \
|
||||
|
|
@ -252,7 +241,6 @@ gzip ChangeLog
|
|||
-D WITH_PYSPATIALITE:BOOL=FALSE \
|
||||
-D WITH_SERVER:BOOL=TRUE \
|
||||
-D WITH_TOUCH:BOOL=TRUE \
|
||||
-D WITH_INTERNAL_FUTURE=FALSE \
|
||||
%{configure_with_spatialite} \
|
||||
.
|
||||
#-D WITH_QTMOBILITY:BOOL=TRUE \
|
||||
|
|
@ -410,8 +398,8 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||
%files -n python2-qgis
|
||||
%{_libdir}/libqgispython.so.*
|
||||
%{_datadir}/%{name}/python/
|
||||
%{python2_sitearch}/%{name}/
|
||||
%{python2_sitearch}/PyQt4/uic/widget-plugins/
|
||||
%{python_sitearch}/%{name}/
|
||||
%{python_sitearch}/PyQt4/uic/widget-plugins/
|
||||
%exclude %{python_sitearch}/%{name}/server/
|
||||
%exclude %{python_sitearch}/%{name}/_server.so
|
||||
|
||||
|
|
@ -420,56 +408,14 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf
|
||||
%{_libdir}/lib%{name}_server.so.*
|
||||
%{_libexecdir}/%{name}/
|
||||
%{python2_sitearch}/%{name}/server/
|
||||
%{python2_sitearch}/%{name}/_server.so
|
||||
%{python_sitearch}/%{name}/server/
|
||||
%{python_sitearch}/%{name}/_server.so
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jan 21 2019 Daniele Viganò <daniele@vigano.me> - 2.18.28-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Dec 24 2018 Daniele Viganò <daniele@vigano.me> - 2.18.27-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Nov 08 2018 Daniele Viganò <daniele@vigano.me> - 2.18.25-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Nov 08 2018 Daniele Viganò <daniele@vigano.me> - 2.18.24-2
|
||||
- Sync with upstream
|
||||
|
||||
* Sat Nov 03 2018 Sandro Mani <manisandro@gmail.com> - 2.18.20-3
|
||||
- Fix broken requires
|
||||
- Fix build with namespaced SIP
|
||||
- Fix grass detection
|
||||
- Fix grass script shebangs
|
||||
|
||||
* Sat Sep 15 2018 Daniele Viganò <daniele@vigano.me> - 2.18.24-1
|
||||
- New upstream release
|
||||
|
||||
* Fri Aug 17 2018 Daniele Viganò <daniele@vigano.me> - 2.18.23-1
|
||||
- New upstream release
|
||||
|
||||
* Sun Jul 22 2018 Daniele Viganò <daniele@vigano.me> - 2.18.22-1
|
||||
- New upstream release
|
||||
|
||||
* Fri Jun 22 2018 Daniele Viganò <daniele@vigano.me> - 2.18.21-1
|
||||
- New upstream release
|
||||
|
||||
* Mon May 21 2018 Daniele Viganò <daniele@vigano.me> - 2.18.20-1
|
||||
- New upstream release
|
||||
|
||||
* Fri Apr 27 2018 Daniele Viganò <daniele@vigano.me> - 2.18.19-2
|
||||
* Wed Jan 31 2018 Daniele Viganò <daniele@vigano.me> - 2.18.16-2
|
||||
- Rebuild for GRASS 7.4
|
||||
|
||||
* Mon Apr 23 2018 Daniele Viganò <daniele@vigano.me> - 2.18.19-1
|
||||
- New upstream release
|
||||
|
||||
* Sat Mar 24 2018 Daniele Viganò <daniele@vigano.me> - 2.18.18-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Feb 28 2018 Daniele Viganò <daniele@vigano.me> - 2.18.17-1
|
||||
- New upstream release
|
||||
|
||||
* Mon Jan 22 2018 Daniele Viganò <daniele@vigano.me> - 2.18.16-1
|
||||
- New upstream release
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Name: saga
|
||||
Version: 2.3.1
|
||||
Release: 5%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Geographic information system with an API for processing geodata
|
||||
|
||||
Group: Applications/Engineering
|
||||
|
|
@ -15,7 +15,6 @@ Source0: %{name}_%{version}_gpl2.tar.gz
|
|||
Patch0: %{name}-projections-gcc6.patch
|
||||
Patch1: %{name}-spelling-errors.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libtool automake autoconf
|
||||
|
|
@ -66,8 +65,8 @@ This package includes the headers and development libraries for SAGA.
|
|||
# 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 ^%{python2_sitearch}/.*\.so$
|
||||
%global __provides_requires_from ^%{python2_sitearch}/.*\.so$
|
||||
%global __provides_exclude_from ^%{python_sitearch}/.*\.so$
|
||||
%global __provides_requires_from ^%{python_sitearch}/.*\.so$
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
|
|
@ -86,7 +85,6 @@ sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \
|
|||
%endif
|
||||
|
||||
%build
|
||||
export PYTHON=python2.7
|
||||
# wxGTK3 3.0.1-3 moved wx-config to libexecdir
|
||||
PATH=$PATH:%{_libexecdir}/wxGTK3/
|
||||
autoreconf -fi
|
||||
|
|
@ -116,7 +114,7 @@ make install DESTDIR=%{buildroot}
|
|||
# Drop libtool archives
|
||||
rm -rf %{buildroot}/%{_libdir}/saga/lib*.la \
|
||||
%{buildroot}/%{_libdir}/saga/libsaga_*.la
|
||||
rm -rf %{buildroot}/%{python2_sitearch}/*.la \
|
||||
rm -rf %{buildroot}/%{python_sitearch}/*.la \
|
||||
%{buildroot}/%{_libdir}/*.la
|
||||
|
||||
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
|
||||
|
|
@ -152,12 +150,6 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 7 2018 Daniele Viganò <daniele@vigano.me> - 2.3.1-5
|
||||
- Make package compatible with F29
|
||||
|
||||
* Fri May 25 2018 Daniele Viganò <daniele@vigano.me> - 2.3.1-4
|
||||
- Make package compatible with F28
|
||||
|
||||
* Thu Jan 18 2018 Daniele Viganò <daniele@vigano.me> - 2.3.1-3
|
||||
- Add from Debian to address segfaults with shapefiles and newer GCC
|
||||
- Add a patch from Debian to fix spelling
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (qgis-2.18.28.tar.bz2) = dd7178a965cd03f44a7dda439352fbf465ee594c90fbb9dc62ab0d4da58ab4718990f2de3582c929eab9e86511da8c3997af3285aea95a729f29915062a10fa7
|
||||
SHA512 (qgis-2.18.16.tar.bz2) = 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
|
||||
|
|
|
|||
Reference in New Issue
Block a user