[fcoe-utils] Don't exclude s390x builds

Petr Šabata psabata at fedoraproject.org
Mon Jul 23 14:40:35 UTC 2012


commit 82037cbe24f2b61e6e9f22d7f9878ce51790806a
Author: Petr Šabata <contyk at redhat.com>
Date:   Mon Jul 23 16:39:16 2012 +0200

    Don't exclude s390x builds

 fcoe-utils-1.0.23-archiver.patch |   13 +++++++++++++
 fcoe-utils.spec                  |   10 ++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/fcoe-utils-1.0.23-archiver.patch b/fcoe-utils-1.0.23-archiver.patch
new file mode 100644
index 0000000..d2c5e16
--- /dev/null
+++ b/fcoe-utils-1.0.23-archiver.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index c412de5..149df47 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,6 +4,8 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_RANLIB
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
+ 
+ PKG_CHECK_MODULES([HBAAPI], [HBAAPI])
+ AC_SUBST([HBAAPI_CFLAGS])
diff --git a/fcoe-utils.spec b/fcoe-utils.spec
index 4c9e987..a5a67ad 100644
--- a/fcoe-utils.spec
+++ b/fcoe-utils.spec
@@ -3,7 +3,7 @@
 
 Name:               fcoe-utils
 Version:            1.0.23
-Release:            2%{?dist}
+Release:            3%{?dist}
 Summary:            Fibre Channel over Ethernet utilities
 Group:              Applications/System
 License:            GPLv2
@@ -13,11 +13,12 @@ Source0:            %{name}-%{version}.tar.bz2
 Source1:            quickstart.txt
 Source2:            fcoe.service
 Source3:            fcoe.config
-ExcludeArch:        ppc s390 s390x
+ExcludeArch:        ppc s390
 # Generic Fedora patches
 Patch1:             fcoe-utils-1.0.19-make.patch
 Patch2:             fcoe-utils-1.0.18-help.patch
 Patch3:             fcoe-utils-1.0.18-config.patch
+Patch4:             fcoe-utils-1.0.23-archiver.patch
 BuildRequires:      libtool automake autoconf
 BuildRequires:      lldpad-devel >= 0.9.43
 BuildRequires:      libhbaapi-devel >= 2.2-12
@@ -42,6 +43,7 @@ fcoemon - service to configure DCB Ethernet QOS filters, works with lldpad
 %patch1 -p1 -b .make
 %patch2 -p1 -b .help
 %patch3 -p1 -b .config
+%patch4 -p1 -b .archiver
 
 %build
 ./bootstrap.sh
@@ -96,6 +98,10 @@ fi
 
 
 %changelog
+* Mon Jul 23 2012 Petr Šabata <contyk at redhat.com> - 1.0.23-3
+- Don't exclude s390x.
+- Add AM_PROG_AR to configure.ac.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list