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

Compare commits

base: dani:9167471aa16255388d0303a0a9bf9a4d34878307
Branches Tags
dani:daniviga-2.18
dani:grass74
dani:master
dani:epel7
dani:v2.18.10
dani:v2.18.9
dani:v2.18.8
dani:v2.18.7
..
compare: dani:466f350b03cfa0cd17f1fe1ddd7c473995422d51
Branches Tags
dani:daniviga-2.18
dani:grass74
dani:master
dani:epel7
dani:v2.18.10
dani:v2.18.9
dani:v2.18.8
dani:v2.18.7

No commits in common. "9167471aa16255388d0303a0a9bf9a4d34878307" and "466f350b03cfa0cd17f1fe1ddd7c473995422d51" have entirely different histories.
9167471aa1 ... 466f350b03

3 changed files with 9 additions and 14 deletions
Show Stats Expand all files Collapse all files

3
.gitignore vendored
View File

@ -37,6 +37,3 @@ qgis_1.5.0.tar.gz
/qgis-2.18.10.tar.bz2 /qgis-2.18.10.tar.bz2
/qgis-2.18.11.tar.bz2 /qgis-2.18.11.tar.bz2
/qgis-2.18.12.tar.bz2 /qgis-2.18.12.tar.bz2
/qgis-2.18.14.tar.bz2
/qgis-2.18.15.tar.bz2
/qgis-2.18.16.tar.bz2

18
qgis.spec
View File

@ -15,7 +15,7 @@
#TODO: Run test suite (see debian/rules) #TODO: Run test suite (see debian/rules)
Name: qgis Name: qgis
Version: 2.18.16 Version: 2.18.12
Release: 1%{?dist} Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering Group: Applications/Engineering
@ -37,7 +37,9 @@ Source4: %{name}-server-README.fedora
Source5: %{name}-mime.xml Source5: %{name}-mime.xml
# Fix builds on 64-bit machines # Fix builds on 64-bit machines
# https://hub.qgis.org/issues/15602 # https://hub.qgis.org/issues/15602
# https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
Patch0: %{name}-lib64.patch Patch0: %{name}-lib64.patch
Patch1: %{name}-2.18.12-pyobject-redefined.patch
# Some plug-ins need Pyspatialite (bundled) # Some plug-ins need Pyspatialite (bundled)
# The license is not totally clear, see: # The license is not totally clear, see:
@ -189,6 +191,11 @@ Please refer to %{name}-server-README.fedora for details!
%setup -q %setup -q
%patch0 -p1 -b .lib64 %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 # Remove executable permissions from source code files
find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
@ -413,15 +420,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Sat Jan 20 2018 Volker Froehlich <volker27@gmx.at> - 2.18.16-1
- New upstream release
* Sat Dec 09 2017 Volker Froehlich <volker27@gmx.at> - 2.18.15-1
- New upstream release
* Tue Nov 07 2017 Volker Froehlich <volker27@gmx.at> - 2.18.14-1
- New upstream release
* Tue Aug 22 2017 Volker Froehlich <volker27@gmx.at> - 2.18.12-1 * Tue Aug 22 2017 Volker Froehlich <volker27@gmx.at> - 2.18.12-1
- New upstream release - New upstream release
- Add patch to solve SIP-4.19-related build failure - Add patch to solve SIP-4.19-related build failure

2
sources
View File

@ -1 +1 @@
SHA512 (qgis-2.18.16.tar.bz2) = 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d SHA512 (qgis-2.18.12.tar.bz2) = e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea