From 109b2f51c4955e883350dd481a87384ccea63d193773557bbc503619179c7bd8 Mon Sep 17 00:00:00 2001 From: Bruno Friedmann Date: Mon, 23 Sep 2019 06:07:17 +0000 Subject: [PATCH] Accepting request 732269 from home:1Antoine1:branches:Application:Geo - Conflict with qgis-ltr and qgis-master rather than obsolete them. - Make sample-data subpackage noarch. OBS-URL: https://build.opensuse.org/request/show/732269 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=270 --- qgis.changes | 6 ++++++ qgis.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/qgis.changes b/qgis.changes index 0749e87..033f64e 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 19 19:03:47 UTC 2019 - Antoine Belvire + +- Conflict with qgis-ltr and qgis-master rather than obsolete them. +- Make sample-data subpackage noarch. + ------------------------------------------------------------------- Mon Sep 16 17:47:08 UTC 2019 - Dirk Stoecker diff --git a/qgis.spec b/qgis.spec index 9dfa52d..1867040 100644 --- a/qgis.spec +++ b/qgis.spec @@ -142,9 +142,9 @@ Requires: python3-termcolor Recommends: %{name}-sample-data Recommends: apache2-mod_fcgid Recommends: gpsbabel +Conflicts: qgis-ltr +Conflicts: qgis-master Obsoletes: qgis2 -Obsoletes: qgis-master -Obsoletes: qgis-ltr %package devel Summary: Development Libraries for QGIS @@ -169,6 +169,7 @@ GRASS plugin for QGIS required to interface with GRASS system. %define sampledir sample-data Summary: QGIS sample data Group: Productivity/Graphics/Visualization/Other +BuildArch: noarch %description QGIS is a Geographic Information System (GIS). QGIS supports vector,