Require just 'systemd' instead of 'systemd-units'

- Patch the fcoemon manpage with a note for systemd users
This commit is contained in:
Petr Šabata 2013-07-31 16:35:42 +02:00
parent 5e980b53e4
commit 7281fbf2d4
2 changed files with 36 additions and 5 deletions

View File

@ -0,0 +1,25 @@
diff --git a/doc/fcoemon.8 b/doc/fcoemon.8
index e9a045b..020394e 100644
--- a/doc/fcoemon.8
+++ b/doc/fcoemon.8
@@ -358,7 +358,7 @@ indicates whether a FIP responder should be activated on this device to support
Note that the attached Ethernet peer device (e\&.g\&. FCoE capable switch port) must have compatible settings For DCB and FCoE to function properly\&.
.SS "/etc/init\&.d/fcoe"
.sp
-This is the \fBfcoe\fR system service script\&. This script is invoked by the init process or by the service command to start and stop the \fBfcoemon\fR\&.
+This is the \fBfcoe\fR system service script\&. This script is invoked by the init process or by the service command to start and stop the \fBfcoemon\fR\&. On systemd-enabled systems, \fBfcoemon\fR is controlled via the \fBfcoe.service\fR unit.
.SH "VLAN NAMING CONVENTIONS"
.sp
If a new VLAN device is created (see the description of the \fIAUTO_VLAN\fR setting above), it will have the name \fIdev\fR\&.\fIvlan\fR\-fcoe; where \fIdev\fR is the name of the Ethernet parent device and \fIvlan\fR is the discovered VLAN ID number\&.
diff --git a/doc/fcoemon.txt b/doc/fcoemon.txt
index ec15197..09ee5a2 100644
--- a/doc/fcoemon.txt
+++ b/doc/fcoemon.txt
@@ -214,6 +214,7 @@ must have compatible settings For DCB and FCoE to function properly.
~~~~~~~~~~~~~~~~
This is the *fcoe* system service script. This script is invoked by the
init process or by the service command to start and stop the *fcoemon*.
+On systemd-enabled systems, *fcoemon* is controlled via the *fcoe.service* unit.
VLAN NAMING CONVENTIONS
-----------------------

View File

@ -3,7 +3,7 @@
Name: fcoe-utils
Version: 1.0.28
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Fibre Channel over Ethernet utilities
Group: Applications/System
License: GPLv2
@ -19,20 +19,21 @@ Patch1: fcoe-utils-1.0.28-make.patch
Patch2: fcoe-utils-1.0.18-help.patch
Patch3: fcoe-utils-1.0.18-config.patch
Patch4: fcoe-utils-1.0.28-format-strings.patch
Patch5: fcoe-utils-1.0.28-systemd-doc.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libhbaapi-devel >= 2.2-12
BuildRequires: libhbalinux-devel >= 1.0.13
BuildRequires: libtool
BuildRequires: lldpad-devel >= 0.9.43
BuildRequires: systemd-units
BuildRequires: systemd
Requires: lldpad >= 0.9.43
Requires: libhbalinux >= 1.0.13
Requires: iproute
Requires: device-mapper-multipath
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
%description
Fibre Channel over Ethernet utilities
@ -46,6 +47,7 @@ cp -v %{SOURCE1} quickstart.txt
%patch2 -p1 -b .help
%patch3 -p1 -b .config
%patch4 -p1 -b .format-strings
%patch5 -p1 -b .systemd-doc
%build
./bootstrap.sh
@ -86,6 +88,10 @@ done
%{_libexecdir}/fcoe/
%changelog
* Wed Jul 31 2013 Petr Šabata <contyk@redhat.com> - 1.0.28-3
- Require just 'systemd' instead of 'systemd-units'
- Patch the fcoemon manpage with a note for systemd users
* Mon Jun 10 2013 Petr Šabata <contyk@redhat.com> - 1.0.28-2
- Enhance the format strings patch to fix ppc64 build failures too