diff --git a/fcoe-utils-1.0.28-make.patch b/fcoe-utils-1.0.29-make.patch similarity index 64% rename from fcoe-utils-1.0.28-make.patch rename to fcoe-utils-1.0.29-make.patch index 33922da..bb9978c 100644 --- a/fcoe-utils-1.0.28-make.patch +++ b/fcoe-utils-1.0.29-make.patch @@ -1,5 +1,5 @@ diff --git a/Makefile.am b/Makefile.am -index a8f2c7c..a99ee91 100644 +index 5cbc15f..57bdbdb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ @@ -9,9 +9,9 @@ index a8f2c7c..a99ee91 100644 -AM_CPPFLAGS = -I${srcdir}/include -I${builddir}/include +AM_CPPFLAGS = -I${srcdir}/include -I${builddir}/include -I/lib/modules/`rpm -q --list kernel | grep "^/lib/modules/.*/build$$" | cut -f4 -d"/" | sort -r | head -1`/build/include ## pass the sysconfdir into the C proprocessor - AM_CPPFLAGS += -DSYSCONFDIR="\"${sysconfdir}\"" - AM_CFLAGS = -Wall -Wformat=2 -Werror -@@ -67,12 +67,9 @@ init_d_SCRIPTS = etc/initd/fcoe + AM_CPPFLAGS += -DSYSCONFDIR="\"${sysconfdir}\"" -D_FORTIFY_SOURCE=2 + AM_CFLAGS = -Wall -Wformat=2 -Werror -Wmissing-prototypes -Wstrict-prototypes +@@ -67,7 +67,7 @@ init_d_SCRIPTS = etc/initd/fcoe dist_noinst_DATA = README COPYING INSTALL fcoe-utils.spec etc/config @@ -19,9 +19,4 @@ index a8f2c7c..a99ee91 100644 +BASH_COMPLETION_DIR=${DESTDIR}/etc/bash_completion.d/ install-data-hook: -- if [ ! -f ${DESTDIR}${fcoe_configdir}/config ] ; then \ -- cp ${srcdir}/etc/config ${DESTDIR}${fcoe_configdir}/config; \ -- fi; \ - if [ ! -d "${BASH_COMPLETION_DIR}" ] ; then \ - mkdir ${BASH_COMPLETION_DIR}; \ - fi; \ + if [ ! -f ${DESTDIR}${fcoe_configdir}/config ] ; then \ diff --git a/fcoe-utils.spec b/fcoe-utils.spec index c0343b1..f26da09 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -2,8 +2,8 @@ %define _hardened_build 1 Name: fcoe-utils -Version: 1.0.28 -Release: 4%{?dist} +Version: 1.0.29 +Release: 1%{?dist} Summary: Fibre Channel over Ethernet utilities Group: Applications/System License: GPLv2 @@ -15,7 +15,7 @@ Source2: fcoe.service Source3: fcoe.config ExcludeArch: ppc s390 s390x # Generic Fedora patches -Patch1: fcoe-utils-1.0.28-make.patch +Patch1: fcoe-utils-1.0.29-make.patch Patch2: fcoe-utils-1.0.18-help.patch Patch3: fcoe-utils-1.0.28-format-strings.patch Patch4: fcoe-utils-1.0.28-systemd-doc.patch @@ -86,6 +86,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Thu Aug 29 2013 Petr Šabata - 1.0.29-1 +- 1.0.29 bump + * Wed Jul 31 2013 Petr Šabata - 1.0.28-4 - Drop the initscript-specific config patch diff --git a/sources b/sources index f713c5f..90f84cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -48d1430d0f90762a99bad5296ef93535 fcoe-utils-1.0.28.tar.gz +473f7dc7ba6a7bbbb2515f6a08573869 fcoe-utils-1.0.29.tar.gz