diff --git a/fcoe-utils-1.0.18-config.patch b/fcoe-utils-1.0.18-config.patch deleted file mode 100644 index 4c5ec66..0000000 --- a/fcoe-utils-1.0.18-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/etc/config b/etc/config -index c993f35..bfccf8c 100644 ---- a/etc/config -+++ b/etc/config -@@ -12,3 +12,8 @@ USE_SYSLOG="yes" - ## Default: list of default drivers - # All supported drivers listed here are loaded when service starts - SUPPORTED_DRIVERS="fcoe bnx2fc" -+ -+## Type: integer -+## Default: 65 -+# Wait at most for this amount of seconds to discover all _netdev fstab devices -+WAIT_TIMEOUT="65" diff --git a/fcoe-utils.spec b/fcoe-utils.spec index a49fa77..c0343b1 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -3,7 +3,7 @@ Name: fcoe-utils Version: 1.0.28 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -17,9 +17,8 @@ ExcludeArch: ppc s390 s390x # Generic Fedora patches 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 +Patch3: fcoe-utils-1.0.28-format-strings.patch +Patch4: fcoe-utils-1.0.28-systemd-doc.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libhbaapi-devel >= 2.2-12 @@ -45,9 +44,8 @@ fcoemon - service to configure DCB Ethernet QOS filters, works with lldpad cp -v %{SOURCE1} quickstart.txt %patch1 -p1 -b .make %patch2 -p1 -b .help -%patch3 -p1 -b .config -%patch4 -p1 -b .format-strings -%patch5 -p1 -b .systemd-doc +%patch3 -p1 -b .format-strings +%patch4 -p1 -b .systemd-doc %build ./bootstrap.sh @@ -88,6 +86,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Wed Jul 31 2013 Petr Šabata - 1.0.28-4 +- Drop the initscript-specific config patch + * 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