From d3abef8d857b5c2079a11c958db63ca4f91021cc175f3569e59de986c2375500 Mon Sep 17 00:00:00 2001 From: LiuhuaMelody Wang Date: Tue, 17 May 2016 09:54:33 +0000 Subject: [PATCH] Accepting request 394993 from home:scarabeus_iv:branches:Base:System - Add conflicts on unsplit packages to allow smooth upgrade path Also do the conflict properly in baselibs.conf - Add dependencies to the devel pacakge in baselibs.conf - Add conflicts on unsplit packages to allow smooth upgrade path Also do the conflict properly in baselibs.conf - Add dependencies to the devel pacakge in baselibs.conf - Add conflicts on unsplit packages to allow smooth upgrade path Also do the conflict properly in baselibs.conf - Add dependencies to the devel pacakge in baselibs.conf OBS-URL: https://build.opensuse.org/request/show/394993 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=151 --- baselibs.conf | 4 ++++ device-mapper.changes | 11 +++++++++++ device-mapper.spec | 2 ++ lvm2-clvm.changes | 11 +++++++++++ lvm2.changes | 11 +++++++++++ lvm2.spec | 2 ++ 6 files changed, 41 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index 59123d7..1e97319 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,7 @@ libdevmapper1_03 + conflicts "device-mapper- < " libdevmapper-event1_03 + conflicts "device-mapper- < " device-mapper-devel + requires "libdevmapper1_03- = " + requires "libdevmapper-event1_03- = " diff --git a/device-mapper.changes b/device-mapper.changes index b7e5496..abf2f8e 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu May 12 08:12:54 UTC 2016 - tchvatal@suse.com + +- Add conflicts on unsplit packages to allow smooth upgrade path + Also do the conflict properly in baselibs.conf + +------------------------------------------------------------------- +Wed May 11 07:54:19 UTC 2016 - tchvatal@suse.com + +- Add dependencies to the devel pacakge in baselibs.conf + ------------------------------------------------------------------- Wed May 4 10:36:40 UTC 2016 - tchvatal@suse.com diff --git a/device-mapper.spec b/device-mapper.spec index 6433057..b2d34d7 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -91,6 +91,7 @@ Programs and man pages for configuring and using the device mapper. %package -n %{libname} Summary: Library for device-mapper Group: System/Libraries +Conflicts: %{name} < %{version} %description -n %{libname} Device mapper main shared library @@ -98,6 +99,7 @@ Device mapper main shared library %package -n %{libname_event} Summary: Event library for device-mapper Group: System/Libraries +Conflicts: %{name} < %{version} %description -n %{libname_event} Device mapper event daemon shared library diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index b7e5496..abf2f8e 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu May 12 08:12:54 UTC 2016 - tchvatal@suse.com + +- Add conflicts on unsplit packages to allow smooth upgrade path + Also do the conflict properly in baselibs.conf + +------------------------------------------------------------------- +Wed May 11 07:54:19 UTC 2016 - tchvatal@suse.com + +- Add dependencies to the devel pacakge in baselibs.conf + ------------------------------------------------------------------- Wed May 4 10:36:40 UTC 2016 - tchvatal@suse.com diff --git a/lvm2.changes b/lvm2.changes index b7e5496..abf2f8e 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu May 12 08:12:54 UTC 2016 - tchvatal@suse.com + +- Add conflicts on unsplit packages to allow smooth upgrade path + Also do the conflict properly in baselibs.conf + +------------------------------------------------------------------- +Wed May 11 07:54:19 UTC 2016 - tchvatal@suse.com + +- Add dependencies to the devel pacakge in baselibs.conf + ------------------------------------------------------------------- Wed May 4 10:36:40 UTC 2016 - tchvatal@suse.com diff --git a/lvm2.spec b/lvm2.spec index 2d40640..39d5520 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -98,6 +98,7 @@ Volume Manager. %package -n %{applib} Summary: LVM2 application api library Group: System/Libraries +Conflicts: %{name} < %{version} %description -n %{applib} LVM library for applications api @@ -105,6 +106,7 @@ LVM library for applications api %package -n %{cmdlib} Summary: LVM2 command line library Group: System/Libraries +Conflicts: %{name} < %{version} %description -n %{cmdlib} The lvm2 command line library allows building programs that manage