pool/util-linux
SHA256
2
0
Fork 4
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 561187 from home:1Antoine1:branches:Base:System

Browse Source 
- 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
This commit is contained in:
Dirk Mueller 2018-01-03 10:24:19 +00:00 committed by Git OBS Bridge
parent c8508b94fa
commit f0504c09e9
6 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-libmount.changes
View File

@ -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 Mon Dec 18 15:30:56 CET 2017 - sbrabec@suse.com

6
python-libmount.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package python-libmount # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -175,13 +175,13 @@ PreReq: %install_info_prereq permissions
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
Provides: login = 4.0-33.7 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). # File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8 Obsoletes: eject < 2.1.0-166.8
# File conflict of login (up to 12.1 and SLE11). # File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7 Obsoletes: login < 4.0-33.7
# File confluct (man page) of rfkill (up to Leap 15 and SLE 15). # 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). # 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. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21

5
util-linux-systemd.changes
View File

@ -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 Mon Dec 18 15:30:56 CET 2017 - sbrabec@suse.com

6
util-linux-systemd.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package util-linux-systemd # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -175,13 +175,13 @@ PreReq: %install_info_prereq permissions
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
Provides: login = 4.0-33.7 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). # File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8 Obsoletes: eject < 2.1.0-166.8
# File conflict of login (up to 12.1 and SLE11). # File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7 Obsoletes: login < 4.0-33.7
# File confluct (man page) of rfkill (up to Leap 15 and SLE 15). # 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). # 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. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21

5
util-linux.changes
View File

@ -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 Mon Dec 18 15:30:56 CET 2017 - sbrabec@suse.com

6
util-linux.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package util-linux # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -175,13 +175,13 @@ PreReq: %install_info_prereq permissions
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
Provides: login = 4.0-33.7 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). # File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8 Obsoletes: eject < 2.1.0-166.8
# File conflict of login (up to 12.1 and SLE11). # File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7 Obsoletes: login < 4.0-33.7
# File confluct (man page) of rfkill (up to Leap 15 and SLE 15). # 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). # 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. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21