From 7281fbf2d4f82fa54246654af3e2b382b9a06f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 31 Jul 2013 16:35:42 +0200 Subject: [PATCH] Require just 'systemd' instead of 'systemd-units' - Patch the fcoemon manpage with a note for systemd users --- fcoe-utils-1.0.28-systemd-doc.patch | 25 +++++++++++++++++++++++++ fcoe-utils.spec | 16 +++++++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 fcoe-utils-1.0.28-systemd-doc.patch diff --git a/fcoe-utils-1.0.28-systemd-doc.patch b/fcoe-utils-1.0.28-systemd-doc.patch new file mode 100644 index 0000000..ada3283 --- /dev/null +++ b/fcoe-utils-1.0.28-systemd-doc.patch @@ -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 + ----------------------- diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 2eeb7e7..a49fa77 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -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 - 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 - 1.0.28-2 - Enhance the format strings patch to fix ppc64 build failures too