Accepting request 281437 from home:AndreasSchwab:f

- Use util-linux:/bin/logger as split-provide,
  /usr/lib/systemd/system/fstrim.service didn't exist in 13.1

OBS-URL: https://build.opensuse.org/request/show/281437
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=270
This commit is contained in:
Stanislav Brabec 2015-01-30 15:19:56 +00:00 committed by Git OBS Bridge
parent 7075a24d0a
commit cfb71fe912
6 changed files with 22 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 15 17:15:47 UTC 2015 - schwab@linux-m68k.org
- Use util-linux:/bin/logger as split-provide,
/usr/lib/systemd/system/fstrim.service didn't exist in 13.1
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 10 02:24:25 UTC 2015 - jengelh@inai.de Sat Jan 10 02:24:25 UTC 2015 - jengelh@inai.de

View File

@ -76,7 +76,7 @@ Name: python-libmount
%endif %endif
Summary: %main_summary Summary: %main_summary
License: GPL-2.0+ License: GPL-2.0+
Group: %group_pl Group: %main_group
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils-devel BuildRequires: binutils-devel
@ -215,7 +215,7 @@ Recommends: which
%if %build_util_linux_systemd %if %build_util_linux_systemd
Supplements: packageand(util-linux:systemd) Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service Provides: util-linux:/bin/logger
# Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 # Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1
Conflicts: util-linux < 2.25 Conflicts: util-linux < 2.25
%systemd_requires %systemd_requires
@ -366,7 +366,6 @@ SMP systems.
%if %build_util_linux %if %build_util_linux
%package -n python-libmount %package -n python-libmount
Summary: %summary_pl Summary: %summary_pl
License: GPL-2.0+
Group: %group_pl Group: %group_pl
%description -n python-libmount %description -n python-libmount

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 15 17:15:47 UTC 2015 - schwab@linux-m68k.org
- Use util-linux:/bin/logger as split-provide,
/usr/lib/systemd/system/fstrim.service didn't exist in 13.1
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 10 02:24:25 UTC 2015 - jengelh@inai.de Sat Jan 10 02:24:25 UTC 2015 - jengelh@inai.de

View File

@ -215,7 +215,7 @@ Recommends: which
%if %build_util_linux_systemd %if %build_util_linux_systemd
Supplements: packageand(util-linux:systemd) Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service Provides: util-linux:/bin/logger
# Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 # Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1
Conflicts: util-linux < 2.25 Conflicts: util-linux < 2.25
%systemd_requires %systemd_requires

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 15 17:15:47 UTC 2015 - schwab@linux-m68k.org
- Use util-linux:/bin/logger as split-provide,
/usr/lib/systemd/system/fstrim.service didn't exist in 13.1
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 10 02:24:25 UTC 2015 - jengelh@inai.de Sat Jan 10 02:24:25 UTC 2015 - jengelh@inai.de

View File

@ -215,7 +215,7 @@ Recommends: which
%if %build_util_linux_systemd %if %build_util_linux_systemd
Supplements: packageand(util-linux:systemd) Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service Provides: util-linux:/bin/logger
# Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 # Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1
Conflicts: util-linux < 2.25 Conflicts: util-linux < 2.25
%systemd_requires %systemd_requires