From 25f13fb19243d71f07df6526787c603092f9b2c9 Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Tue, 7 Nov 2017 09:59:53 +0100 Subject: [PATCH 1/7] New upstream release 2.18.14 --- .gitignore | 1 + qgis.spec | 12 ++++-------- sources | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 7a8dd79..2828482 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.10.tar.bz2 /qgis-2.18.11.tar.bz2 /qgis-2.18.12.tar.bz2 +/qgis-2.18.14.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 5d5f70f..b2ed2f5 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,7 +15,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.12 +Version: 2.18.14 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -37,9 +37,7 @@ 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 -Patch1: %{name}-2.18.12-pyobject-redefined.patch # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: @@ -191,11 +189,6 @@ Please refer to %{name}-server-README.fedora for details! %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 {} \+ @@ -420,6 +413,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Tue Nov 07 2017 Volker Froehlich - 2.18.14-1 +- New upstream release + * Tue Aug 22 2017 Volker Froehlich - 2.18.12-1 - New upstream release - Add patch to solve SIP-4.19-related build failure diff --git a/sources b/sources index ef85b44..c1709a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.12.tar.bz2) = e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea +SHA512 (qgis-2.18.14.tar.bz2) = da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036 From 94069edd31896c7d98b3cc516025125ce46642ea Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Sat, 9 Dec 2017 02:13:53 +0100 Subject: [PATCH 2/7] New version 2.18.15 --- .gitignore | 1 + qgis.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2828482..30db146 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.11.tar.bz2 /qgis-2.18.12.tar.bz2 /qgis-2.18.14.tar.bz2 +/qgis-2.18.15.tar.bz2 diff --git a/qgis.spec b/qgis.spec index b2ed2f5..1dd2cba 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,7 +15,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.14 +Version: 2.18.15 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -413,6 +413,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sat Dec 09 2017 Volker Froehlich - 2.18.15-1 +- New upstream release + * Tue Nov 07 2017 Volker Froehlich - 2.18.14-1 - New upstream release diff --git a/sources b/sources index c1709a5..26c8b42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.14.tar.bz2) = da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036 +SHA512 (qgis-2.18.15.tar.bz2) = ec079b0c56d8aff941a3e9bced8e5c93fdf0af96d0cd4afe5e771086e37b12c248aa05f8276d351a0da6f4e5782155f6159c81772d0b51ebbfc6ca2958f1f584 From 9167471aa16255388d0303a0a9bf9a4d34878307 Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Sat, 20 Jan 2018 12:42:14 +0100 Subject: [PATCH 3/7] New version 2.18.16 --- .gitignore | 1 + qgis.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 30db146..cd839f8 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.12.tar.bz2 /qgis-2.18.14.tar.bz2 /qgis-2.18.15.tar.bz2 +/qgis-2.18.16.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 1dd2cba..7b41004 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,7 +15,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.15 +Version: 2.18.16 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -413,6 +413,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sat Jan 20 2018 Volker Froehlich - 2.18.16-1 +- New upstream release + * Sat Dec 09 2017 Volker Froehlich - 2.18.15-1 - New upstream release diff --git a/sources b/sources index 26c8b42..87916ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.15.tar.bz2) = ec079b0c56d8aff941a3e9bced8e5c93fdf0af96d0cd4afe5e771086e37b12c248aa05f8276d351a0da6f4e5782155f6159c81772d0b51ebbfc6ca2958f1f584 +SHA512 (qgis-2.18.16.tar.bz2) = 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d From 224d6a2a6e9ce4510ac9ccf30b5ef3d7a67dbf86 Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Thu, 8 Feb 2018 18:56:56 +0100 Subject: [PATCH 4/7] Remove Group keyword --- qgis.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index 7b41004..7c5b670 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,9 +16,8 @@ Name: qgis Version: 2.18.16 -Release: 1%{?dist} +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 @@ -413,6 +412,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Thu Feb 08 2018 Volker Fröhlich - 2.18.16-2 +- Remove Group keyword + * Sat Jan 20 2018 Volker Froehlich - 2.18.16-1 - New upstream release From 8bbec483cdd4934da43aef526be9575e8c469bdb Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Thu, 8 Feb 2018 19:01:52 +0100 Subject: [PATCH 5/7] Another Group keyword --- qgis.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/qgis.spec b/qgis.spec index 7c5b670..2092670 100644 --- a/qgis.spec +++ b/qgis.spec @@ -122,7 +122,6 @@ and USGS ASCII DEM. %package devel Summary: Development Libraries for the QGIS -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -130,7 +129,6 @@ 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. @@ -150,7 +148,6 @@ 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: gdal-python Requires: PyQt4-webkit @@ -170,7 +167,6 @@ 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} From c950aaccf04caaa08a5ecdc225c1fbc0b9643f1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 12:11:34 +0000 Subject: [PATCH 6/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 2092670..95fb492 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://hub.qgis.org/issues/3789 @@ -408,6 +408,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.18.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Feb 08 2018 Volker Fröhlich - 2.18.16-2 - Remove Group keyword From 60b15c1d7e9ec656088f8b70c497045748295bfa Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Sat, 3 Mar 2018 07:53:31 +0100 Subject: [PATCH 7/7] Rebuild for Grass --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 95fb492..4e6db1b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://hub.qgis.org/issues/3789 @@ -408,6 +408,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sat Mar 03 2018 Volker Fröhlich - 2.18.16-4 +- Rebuild for Grass + * Fri Feb 09 2018 Fedora Release Engineering - 2.18.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild