From cfb71fe91294d0f5addc3ae1394e3756060c43f099853c4530d3f3f8297a4bb0 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Fri, 30 Jan 2015 15:19:56 +0000 Subject: [PATCH] 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 --- python-libmount.changes | 6 ++++++ python-libmount.spec | 5 ++--- util-linux-systemd.changes | 6 ++++++ util-linux-systemd.spec | 2 +- util-linux.changes | 6 ++++++ util-linux.spec | 2 +- 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index aefa97f..f6af435 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -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 diff --git a/python-libmount.spec b/python-libmount.spec index 08b1d77..3044f84 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -76,7 +76,7 @@ Name: python-libmount %endif Summary: %main_summary License: GPL-2.0+ -Group: %group_pl +Group: %main_group BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -215,7 +215,7 @@ Recommends: which %if %build_util_linux_systemd Supplements: packageand(util-linux:systemd) # 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 Conflicts: util-linux < 2.25 %systemd_requires @@ -366,7 +366,6 @@ SMP systems. %if %build_util_linux %package -n python-libmount Summary: %summary_pl -License: GPL-2.0+ Group: %group_pl %description -n python-libmount diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index aefa97f..f6af435 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -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 diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 7fb79f5..65ad4fc 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -215,7 +215,7 @@ Recommends: which %if %build_util_linux_systemd Supplements: packageand(util-linux:systemd) # 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 Conflicts: util-linux < 2.25 %systemd_requires diff --git a/util-linux.changes b/util-linux.changes index aefa97f..f6af435 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -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 diff --git a/util-linux.spec b/util-linux.spec index 802815b..d3e8902 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -215,7 +215,7 @@ Recommends: which %if %build_util_linux_systemd Supplements: packageand(util-linux:systemd) # 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 Conflicts: util-linux < 2.25 %systemd_requires