From f0504c09e98324c27b12e013d9e014eeeb6186debab4592a8f22143c2a9ae43d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 3 Jan 2018 10:24:19 +0000 Subject: [PATCH] Accepting request 561187 from home:1Antoine1:branches:Base:System - Fix Obsoletes for rfkill (boo#1074250). "<= rfkill-version" instead of "< rfkill-version", see https://en.opensuse.org/openSUSE:Package_dependencies#Merging_a_package. This allows rfkill to be automatically removed instead of having a file conflict. OBS-URL: https://build.opensuse.org/request/show/561187 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=356 --- python-libmount.changes | 5 +++++ python-libmount.spec | 6 +++--- util-linux-systemd.changes | 5 +++++ util-linux-systemd.spec | 6 +++--- util-linux.changes | 5 +++++ util-linux.spec | 6 +++--- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index 53eb8c6..fefdce9 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 1 10:32:51 UTC 2018 - antoine.belvire@opensuse.org + +- Fix Obsoletes for rfkill (boo#1074250). + ------------------------------------------------------------------- Mon Dec 18 15:30:56 CET 2017 - sbrabec@suse.com diff --git a/python-libmount.spec b/python-libmount.spec index 8d0305a..a814470 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -1,7 +1,7 @@ # # spec file for package python-libmount # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -175,13 +175,13 @@ PreReq: %install_info_prereq permissions Recommends: %{name}-lang = %{version} Provides: eject = 2.1.0-166.8 Provides: login = 4.0-33.7 -Provides: rfkill = 0.5-8.6 +Provides: rfkill = 0.5 # File conflict of eject (up to 12.3 and SLE11). Obsoletes: eject < 2.1.0-166.8 # File conflict of login (up to 12.1 and SLE11). Obsoletes: login < 4.0-33.7 # File confluct (man page) of rfkill (up to Leap 15 and SLE 15). -Obsoletes: rfkill < 0.5-8.6 +Obsoletes: rfkill <= 0.5 # File conflict of su and kill (up to 12.3 and SLE11). # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. Conflicts: coreutils < 8.21 diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 53eb8c6..fefdce9 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 1 10:32:51 UTC 2018 - antoine.belvire@opensuse.org + +- Fix Obsoletes for rfkill (boo#1074250). + ------------------------------------------------------------------- Mon Dec 18 15:30:56 CET 2017 - sbrabec@suse.com diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index c5be432..fe52efa 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -1,7 +1,7 @@ # # spec file for package util-linux-systemd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -175,13 +175,13 @@ PreReq: %install_info_prereq permissions Recommends: %{name}-lang = %{version} Provides: eject = 2.1.0-166.8 Provides: login = 4.0-33.7 -Provides: rfkill = 0.5-8.6 +Provides: rfkill = 0.5 # File conflict of eject (up to 12.3 and SLE11). Obsoletes: eject < 2.1.0-166.8 # File conflict of login (up to 12.1 and SLE11). Obsoletes: login < 4.0-33.7 # File confluct (man page) of rfkill (up to Leap 15 and SLE 15). -Obsoletes: rfkill < 0.5-8.6 +Obsoletes: rfkill <= 0.5 # File conflict of su and kill (up to 12.3 and SLE11). # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. Conflicts: coreutils < 8.21 diff --git a/util-linux.changes b/util-linux.changes index 53eb8c6..fefdce9 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 1 10:32:51 UTC 2018 - antoine.belvire@opensuse.org + +- Fix Obsoletes for rfkill (boo#1074250). + ------------------------------------------------------------------- Mon Dec 18 15:30:56 CET 2017 - sbrabec@suse.com diff --git a/util-linux.spec b/util-linux.spec index 19e2fcc..898c688 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,7 +1,7 @@ # # spec file for package util-linux # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -175,13 +175,13 @@ PreReq: %install_info_prereq permissions Recommends: %{name}-lang = %{version} Provides: eject = 2.1.0-166.8 Provides: login = 4.0-33.7 -Provides: rfkill = 0.5-8.6 +Provides: rfkill = 0.5 # File conflict of eject (up to 12.3 and SLE11). Obsoletes: eject < 2.1.0-166.8 # File conflict of login (up to 12.1 and SLE11). Obsoletes: login < 4.0-33.7 # File confluct (man page) of rfkill (up to Leap 15 and SLE 15). -Obsoletes: rfkill < 0.5-8.6 +Obsoletes: rfkill <= 0.5 # File conflict of su and kill (up to 12.3 and SLE11). # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. Conflicts: coreutils < 8.21