diff --git a/installation-images.changes b/installation-images.changes index 7dd9155..78c85b5 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 28 14:35:39 UTC 2017 - jimmy@boombatower.com + +- Add Conflicts: otherproviders() and Provides for relevant packages. + -------------------------------------------------------------------- Mon Jul 24 10:39:46 UTC 2017 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 804d86d..6612cdd 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -534,6 +534,7 @@ Group: Metapackages Version: 14.322 Release: 0 Provides: installation-images = %version-%release +Conflicts: otherproviders(installation-images) Source: installation-images-%{version}.tar.xz Source1: installation-images-rpmlintrc Source2: product_name @@ -546,6 +547,7 @@ Files needed for %theme installation media. %package -n install-initrd-%{theme} Provides: install-initrd = %version-%release +Conflicts: otherproviders(install-initrd) Obsoletes: install-initrd-%theme < %version-%release Obsoletes: install-initrd-branding-%theme < %version-%release AutoReqProv: off @@ -570,6 +572,8 @@ to install SUSE CaaS Platform with PXE boot/tftpboot on x86-64. %package -n skelcd-installer-%{theme} +Provides: skelcd-installer = %version-%release +Conflicts: otherproviders(skelcd-installer) AutoReqProv: off Summary: installer and related files needed on dvd1 Group: Metapackages @@ -581,6 +585,7 @@ needed on the first product dvds to start an installation. %package -n installation-images-debuginfodeps-%{theme} Provides: installation-images-debuginfodeps = %version-%release +Conflicts: otherproviders(installation-images-debuginfodeps) Obsoletes: installation-images-debuginfodeps-%theme < %version-%release Summary: Debuginfo dependencies for %theme installation-images Group: Metapackages