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 <antoine.belvire@opensuse.org>
+
+- 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 <opensuse@dstoecker.de>
 
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,