From 9e7b95a6230706968bfa9154eb0d50449cfc31fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Fri, 19 Apr 2019 09:05:10 +0200 Subject: [PATCH 1/9] New version 3.4.6 and rebuild for BZ#1701420 --- .gitignore | 1 + qgis.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b0bd1f0..9ca1773 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.20.tar.bz2 /qgis-2.18.25.tar.bz2 /qgis-3.4.4.tar.bz2 +/qgis-3.4.6.tar.bz2 diff --git a/qgis.spec b/qgis.spec index a2757c9..2c8afd5 100644 --- a/qgis.spec +++ b/qgis.spec @@ -23,8 +23,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.4.4 -Release: 3%{?dist} +Version: 3.4.6 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -379,6 +379,10 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Fri Apr 19 2019 Volker Fröhlich - 3.4.6-1 +- New upstream release +- Rebuild for BZ#1701420 + * Sat Feb 16 2019 Björn Esser - 3.4.4-3 - rebuilt (qscintilla) diff --git a/sources b/sources index d91dcc6..deffe62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.4.4.tar.bz2) = 6f38f189f40081fa90128e0c8be8a64c522f84ba22929178d498e855b50de0047539de5ec2968736cfe9a0dfdd8dc856726f4ff51e4c3b6f629aca7151c1ea66 +SHA512 (qgis-3.4.6.tar.bz2) = d0baf4daa9920c7981aae14057dad21b22880dba6251202ca7eceae1d8ac3e33be03b66997752011159c190596ef396ac430b968191bde81eb26e694d7df03a0 From f0419f578e73f93a033d83fb1e696444f6ee1500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Wed, 22 May 2019 09:14:30 +0200 Subject: [PATCH 2/9] Remove dependency on PyQt5-webkit (BZ#1712275) I'm not sure why that was there in the first place. It probably dates back to a time where some Qt5 packages were layed out differently and must have provided something that was not a library in a normal path. --- qgis.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index 2c8afd5..8b63657 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.4.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -165,7 +165,6 @@ Obsoletes: %{name}-python < %{version}-%{release} Summary: Python integration and plug-ins for QGIS Requires: %{name}%{?_isa} = %{version}-%{release} Requires: gdal-python3 -Requires: PyQt5-webkit Requires: python3-httplib2 Requires: python3-jinja2 Requires: python3-matplotlib @@ -379,6 +378,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Wed May 22 2019 Volker Fröhlich - 3.4.6-2 +- Remove the dependency on PyQt5-webkit, BZ#1712275 + * Fri Apr 19 2019 Volker Fröhlich - 3.4.6-1 - New upstream release - Rebuild for BZ#1701420 From 26cbb06cd677af5699b2f21ed5024b5d0b1b2eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Wed, 22 May 2019 18:32:46 +0200 Subject: [PATCH 3/9] Add BR qt5-qtbase-private-devel --- qgis.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qgis.spec b/qgis.spec index 8b63657..63ddb20 100644 --- a/qgis.spec +++ b/qgis.spec @@ -102,6 +102,7 @@ BuildRequires: qtkeychain-qt5-devel BuildRequires: qscintilla-qt5-devel BuildRequires: qt5-devel +BuildRequires: qt5-qtbase-private-devel #TODO: Something doesn't work here -- no idea what I meant by that. BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt-mobility-devel @@ -380,6 +381,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog * Wed May 22 2019 Volker Fröhlich - 3.4.6-2 - Remove the dependency on PyQt5-webkit, BZ#1712275 +- Add qt5-qtbase-private-devel for QtSql/private/qsqlcachedresult_p.h * Fri Apr 19 2019 Volker Fröhlich - 3.4.6-1 - New upstream release From 84ed1d334378fe42d02ef0c9872669893a3c551b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Wed, 5 Jun 2019 09:23:39 +0200 Subject: [PATCH 4/9] Require python3-sip-api instead of sip-api, BZ#1714490 --- qgis.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index 63ddb20..5a88989 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.4.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -174,7 +174,7 @@ Requires: python3-psycopg2 Requires: python3-pygments Requires: python3-PyYAML Requires: python3-qscintilla -%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} +%{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}} %description -n python3-qgis Python integration and plug-ins for QGIS. @@ -379,6 +379,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Wed Jun 05 2019 Volker Fröhlich - 3.4.6-3 +- Require python3-sip-api instead of sip-api, BZ#1714490 + * Wed May 22 2019 Volker Fröhlich - 3.4.6-2 - Remove the dependency on PyQt5-webkit, BZ#1712275 - Add qt5-qtbase-private-devel for QtSql/private/qsqlcachedresult_p.h From a53af8c5f88df990194698cc440355ad18553097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Fri, 7 Jun 2019 09:06:57 +0200 Subject: [PATCH 5/9] Add BR python3-qt5-webkit, BZ#1712275 --- qgis.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 5a88989..6547a4a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.4.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -174,6 +174,7 @@ Requires: python3-psycopg2 Requires: python3-pygments Requires: python3-PyYAML Requires: python3-qscintilla +Requires: python3-qt5-webkit %{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}} %description -n python3-qgis @@ -379,6 +380,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Fri Jun 07 2019 Volker Fröhlich - 3.4.6-4 +- Add BR python3-qt5-webkit, BZ#1712275 + * Wed Jun 05 2019 Volker Fröhlich - 3.4.6-3 - Require python3-sip-api instead of sip-api, BZ#1714490 From 4f5eccf1637bbd54f22ccb908a36c32676226494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Fri, 21 Jun 2019 10:11:16 +0200 Subject: [PATCH 6/9] Require python3-qscintilla-qt5 in python3 sub-package, BZ#1722653 --- qgis.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 6547a4a..ac92061 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.4.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -174,6 +174,7 @@ Requires: python3-psycopg2 Requires: python3-pygments Requires: python3-PyYAML Requires: python3-qscintilla +Requires: python3-qscintilla-qt5 Requires: python3-qt5-webkit %{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}} @@ -380,6 +381,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Fri Jun 21 2019 Volker Fröhlich - 3.4.6-5 +- Require python3-qscintilla-qt5 in python3 sub-package, BZ#1722653 + * Fri Jun 07 2019 Volker Fröhlich - 3.4.6-4 - Add BR python3-qt5-webkit, BZ#1712275 From 65f2cc31f02605027fe67d4573c5e766fc0f0333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Tue, 25 Jun 2019 23:35:50 +0200 Subject: [PATCH 7/9] New version 3.4.9 --- .gitignore | 1 + qgis.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9ca1773..6ae45a3 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.25.tar.bz2 /qgis-3.4.4.tar.bz2 /qgis-3.4.6.tar.bz2 +/qgis-3.4.9.tar.bz2 diff --git a/qgis.spec b/qgis.spec index ac92061..4bb6dd9 100644 --- a/qgis.spec +++ b/qgis.spec @@ -23,8 +23,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.4.6 -Release: 5%{?dist} +Version: 3.4.9 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -381,6 +381,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Tue Jun 25 2019 Volker Fröhlich - 3.4.9-1 +- New upstream release + * Fri Jun 21 2019 Volker Fröhlich - 3.4.6-5 - Require python3-qscintilla-qt5 in python3 sub-package, BZ#1722653 diff --git a/sources b/sources index deffe62..fc0beb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-3.4.6.tar.bz2) = d0baf4daa9920c7981aae14057dad21b22880dba6251202ca7eceae1d8ac3e33be03b66997752011159c190596ef396ac430b968191bde81eb26e694d7df03a0 +SHA512 (qgis-3.4.9.tar.bz2) = ac4d2213af993db03414d64cca8b98665d75d4535002d750f3466d21ee5fdf26293ad99a35bdb410b616fe875c1711d1918adee81922720927aadccc9c85508d From 8328c3632e07648048520d2d97cb78df8f1bb927 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 26 Jun 2019 15:06:25 -0500 Subject: [PATCH 8/9] rebuild (qt5) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 4bb6dd9..a47ff61 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -381,6 +381,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Wed Jun 26 2019 Rex Dieter - 3.4.9-2 +- rebuild (qt5) + * Tue Jun 25 2019 Volker Fröhlich - 3.4.9-1 - New upstream release From 5b1126823ea796aa517d343141376a88b0d647f6 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 26 Sep 2019 13:55:01 +0200 Subject: [PATCH 9/9] rebuild (qt5) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index a47ff61..0800989 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis Version: 3.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -381,6 +381,9 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %changelog +* Thu Sep 26 2019 Jan Grulich - 3.4.9-3 +- rebuild (qt5) + * Wed Jun 26 2019 Rex Dieter - 3.4.9-2 - rebuild (qt5)