From 472f8236f12f942e2447ece8e6b080cbb2f1ba28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Wed, 20 Apr 2016 22:42:54 +0200 Subject: [PATCH 1/5] BR qca2 instead of qca --- qgis.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/qgis.spec b/qgis.spec index 8c452ce..e2699f8 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,7 +15,7 @@ Name: qgis Version: 2.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -69,7 +69,8 @@ BuildRequires: PyQt4-devel BuildRequires: PyQwt-devel %endif BuildRequires: python2-devel -BuildRequires: qca-devel +# qca2 is a virtual provides of qca. Put here to make things easier for EPEL! +BuildRequires: qca2-devel BuildRequires: qextserialport-devel BuildRequires: qscintilla-devel BuildRequires: qscintilla-python-devel @@ -131,7 +132,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} # WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though # the soname might stay the same, it won't work anymore. #http://hub.qgis.org/issues/5274 -Requires: grass => 7.0.3 +Requires: grass = 7.0.3 %description grass GRASS plugin for QGIS required to interface with the GRASS system. @@ -405,6 +406,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Wed Apr 20 2016 Volker Froehlich - 2.14.1-2 +- Change BR of qca to qca2 to make things easier in EPEL +- Rebuild for BZ #1327360 +- Make the requires on grass match an exact version again + * Sun Mar 27 2016 Volker Froehlich - 2.14.1-1 - New upstream release - Resolve the false sub-package dependency of python on server From aec04efa3ff112e29ddf2e07062b884c5f204a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Mon, 23 May 2016 23:59:57 +0200 Subject: [PATCH 2/5] New version 2.14.3 --- .gitignore | 1 + qgis.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e65c829..31e0767 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ qgis_1.5.0.tar.gz /qgis-2.12.3.tar.bz2 /qgis-2.14.0.tar.bz2 /qgis-2.14.1.tar.bz2 +/qgis-2.14.3.tar.bz2 diff --git a/qgis.spec b/qgis.spec index e2699f8..c2649e1 100644 --- a/qgis.spec +++ b/qgis.spec @@ -14,8 +14,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.14.1 -Release: 2%{?dist} +Version: 2.14.3 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -132,7 +132,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} # WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though # the soname might stay the same, it won't work anymore. #http://hub.qgis.org/issues/5274 -Requires: grass = 7.0.3 +Requires: grass = 7.0.4 %description grass GRASS plugin for QGIS required to interface with the GRASS system. @@ -406,6 +406,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon May 23 2016 Volker Froehlich - 2.14.3-1 +- New upstream release + * Wed Apr 20 2016 Volker Froehlich - 2.14.1-2 - Change BR of qca to qca2 to make things easier in EPEL - Rebuild for BZ #1327360 diff --git a/sources b/sources index 4800bfd..ff1bd33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -60e0708650303f28fdfe84b555c41c18 qgis-2.14.1.tar.bz2 +8598c7bbe47d3b88c0df5524589d2cb0 qgis-2.14.3.tar.bz2 From fd81d10f433eaa02c9648f268c8425569cb08512 Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Mon, 6 Jun 2016 09:48:42 +0200 Subject: [PATCH 3/5] Require grass version in BR instead of Req This will avoid building with a different version than intended. The sub-package dependencies is taken care of by soname versions. --- qgis.spec | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/qgis.spec b/qgis.spec index c2649e1..eef29dd 100644 --- a/qgis.spec +++ b/qgis.spec @@ -11,6 +11,12 @@ %endif %endif + +# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though +# the soname might stay the same, it won't work anymore. +#http://hub.qgis.org/issues/5274 +%global grass_version 7.0.4 + #TODO: Run test suite (see debian/rules) Name: qgis @@ -50,7 +56,7 @@ BuildRequires: fcgi-devel BuildRequires: flex bison BuildRequires: gdal-devel BuildRequires: geos-devel -BuildRequires: grass-devel +BuildRequires: grass-devel = %{grass_version} BuildRequires: gsl-devel %ifarch ppc ppc64 @@ -127,12 +133,8 @@ Group: Applications/Engineering Requires: %{name}%{?_isa} = %{version}-%{release} # The plug-in requires more than just the grass-libs. -# This questions the sense of the libs package is questionable - -# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though -# the soname might stay the same, it won't work anymore. -#http://hub.qgis.org/issues/5274 -Requires: grass = 7.0.4 +# This questions the sense of the libs package. +Requires: grass %description grass GRASS plugin for QGIS required to interface with the GRASS system. @@ -406,6 +408,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Jun 06 2016 Volker Froehlich - 2.14.3-2 +- Move grass version to BR. This will avoid building with a + different version than intended. The sub-package dependencies + is taken care of by soname versions. + * Mon May 23 2016 Volker Froehlich - 2.14.3-1 - New upstream release From 14e1a8349ad5268d3539094fc363814f2cce2a0d Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Mon, 6 Jun 2016 09:50:44 +0200 Subject: [PATCH 4/5] Correct release --- qgis.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index eef29dd..236ac9a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -21,7 +21,7 @@ Name: qgis Version: 2.14.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering From 5a8c089842564a55369ed76d28d1a98bf8825a69 Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Tue, 7 Jun 2016 09:19:23 +0200 Subject: [PATCH 5/5] Version bump to be newer than F24 --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 236ac9a..2b8ee0b 100644 --- a/qgis.spec +++ b/qgis.spec @@ -21,7 +21,7 @@ Name: qgis Version: 2.14.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -408,6 +408,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Tue Jun 07 2016 Volker Froehlich - 2.14.3-3 +- Version bump to be newer than F24 + * Mon Jun 06 2016 Volker Froehlich - 2.14.3-2 - Move grass version to BR. This will avoid building with a different version than intended. The sub-package dependencies