From eb7c5f94bcf2c867780c348a125703a2eb5bdf4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sun, 17 Jun 2018 15:34:17 +0200 Subject: [PATCH 1/4] New upstream version 2.18.20 --- .gitignore | 1 + qgis.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cd839f8..bca24ea 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.14.tar.bz2 /qgis-2.18.15.tar.bz2 /qgis-2.18.16.tar.bz2 +/qgis-2.18.20.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 4e6db1b..0ea3417 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,8 +15,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.16 -Release: 4%{?dist} +Version: 2.18.20 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://hub.qgis.org/issues/3789 @@ -408,6 +408,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sun Jun 17 2018 Volker Fröhlich - 2.18.20-1 +- New upstream release +- Rebuild for Grass to solve BZ#1577583 + * Sat Mar 03 2018 Volker Fröhlich - 2.18.16-4 - Rebuild for Grass diff --git a/sources b/sources index 87916ac..1e652c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.16.tar.bz2) = 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d +SHA512 (qgis-2.18.20.tar.bz2) = 094e33019d6832e09d5aace067a2870ac1dffa86cdeef70666c8c344f79c4a16de6b16074349e8430fadda62e987d5b6517cf337fd06c4cc0e4e84b85a749199 From d928d500698e4cde04a764fe200614ce1f84bdbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:00:12 +0000 Subject: [PATCH 2/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 0ea3417..7dd6c77 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,7 +16,7 @@ Name: qgis Version: 2.18.20 -Release: 1%{?dist} +Release: 2%{?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 Jul 14 2018 Fedora Release Engineering - 2.18.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Jun 17 2018 Volker Fröhlich - 2.18.20-1 - New upstream release - Rebuild for Grass to solve BZ#1577583 From 5d08ec0f5a98332bfc25199f30ea91e5e4f7635e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 30 Jul 2018 00:22:30 +0200 Subject: [PATCH 3/4] =?UTF-8?q?%{python=5Fsitearch}=20=E2=86=92=20%{python?= =?UTF-8?q?2=5Fsitearch}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Igor Gnatenko --- qgis.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qgis.spec b/qgis.spec index 7dd6c77..d1c9d32 100644 --- a/qgis.spec +++ b/qgis.spec @@ -393,8 +393,8 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files -n python2-qgis %{_libdir}/libqgispython.so.* %{_datadir}/%{name}/python/ -%{python_sitearch}/%{name}/ -%{python_sitearch}/PyQt4/uic/widget-plugins/ +%{python2_sitearch}/%{name}/ +%{python2_sitearch}/PyQt4/uic/widget-plugins/ %exclude %{python_sitearch}/%{name}/server/ %exclude %{python_sitearch}/%{name}/_server.so @@ -403,8 +403,8 @@ 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}/ -%{python_sitearch}/%{name}/server/ -%{python_sitearch}/%{name}/_server.so +%{python2_sitearch}/%{name}/server/ +%{python2_sitearch}/%{name}/_server.so %changelog From 86abed401388fcf10c710326bd2a66e1670bc8e2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 30 Jul 2018 00:28:02 +0200 Subject: [PATCH 4/4] =?UTF-8?q?python-devel=20=E2=86=92=20python2-devel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Igor Gnatenko --- qgis.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index d1c9d32..2cd2ee9 100644 --- a/qgis.spec +++ b/qgis.spec @@ -78,7 +78,7 @@ BuildRequires: qextserialport-devel BuildRequires: qjson-devel BuildRequires: qscintilla-devel BuildRequires: qscintilla-python -BuildRequires: qscintilla-python-devel +BuildRequires: qscintilla-python2-devel BuildRequires: qt4-devel #BuildRequires: qt-mobility-devel BuildRequires: qt4-webkit-devel