Disable InfiniBand support on 32-bit ARM architectures

2019-05-03 11:40:19 +02:00
2 changed files with 8 additions and 161 deletions
--- a/whatsup-1.14-Adjust-to-Autoconf-2.71.patch
+++ b/whatsup-1.14-Adjust-to-Autoconf-2.71.patch
@ -1,59 +0,0 @@
-From c261979245527ae780f83d00d3cffcc117873658 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 26 Nov 2021 14:55:49 +0100
-Subject: [PATCH] Adjust to Autoconf-2.71
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Autoconf-2.71 fixed handling traling white spaces (marked with an
-underscore here):
-
-    AC_CHECK_FUNCS( \
-      strcpy \
-      strdup \
-      strchr \_
-      strlen \_
-      strcat \_
-      strtok \_
-    )
-
-and correctly converted them to this shell code:
-
-    for ac_func in strcpy strdup strchr \ strlen \ strcat \ strtok \
-    do :
-      [...]
-    done
-
-This patch removes the trailing new lines.
-
-<https://bugzilla.redhat.com/show_bug.cgi?id=1999491>
-<https://savannah.gnu.org/support/index.php?110571>
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
---
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 668b3c9..0f7c26d 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -174,10 +174,10 @@ AC_FUNC_MALLOC
- AC_CHECK_FUNCS( \
-   strcpy \
-   strdup \
-  strchr \ 
-  strlen \ 
-  strcat \ 
-  strtok \ 
-+  strchr \
-+  strlen \
-+  strcat \
-+  strtok \
- )
- AC_CHECK_FUNCS([getopt_long])
- 
-- 
-2.31.1
-
--- a/whatsup.spec
+++ b/whatsup.spec
@ -11,19 +11,13 @@
 Summary:       Node up/down detection utility
 Name:          whatsup
 Version:       1.14
-Release:       53%{?dist}
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License:       GPL-2.0-or-later
+Release:       25%{?dist}
+License:       GPLv2+
 URL:           https://computing.llnl.gov/linux/whatsup.html
 Source0:       http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}-1/%{name}-%{version}.tar.gz
 Source1:       %{name}-hostsfile
 Source2:       %{name}-pingd.service
 Patch0:        %{name}-%{version}-bug#1117251.patch
-# Adjust to Autconf-2.71, bug #1999491,
-# <https://savannah.gnu.org/support/index.php?110571>,
-# <https://github.com/chaos/whatsup/pull/3>
-Patch1:        %{name}-%{version}-Adjust-to-Autoconf-2.71.patch
-BuildRequires: make
 BuildRequires: perl-devel
 BuildRequires: perl-generators
 BuildRequires: perl(ExtUtils::MakeMaker) expat-devel, libtool-ltdl-devel, libgenders-devel
@ -97,6 +91,7 @@ pingd daemon for %{name}
 %package -n    perl-%{libname}
 Summary:       Perl bindings for %{libname}
 Requires:      %{libname} = %{version}-%{release}
+Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %description -n perl-%{libname}
 Perl bindings for %{libname}

@ -119,8 +114,7 @@ Genders clusterlist module for %{libname}

 %prep
 %setup -q
-%patch -P0 -p0
-%patch -P1 -p1
+%patch0 -p0
 %if 0%{?fedora} > 17
 autoreconf -I config -f -i
 %endif
@ -188,8 +182,7 @@ if [ $1 -eq 1 ] ; then
    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 %endif
-%else
-# EPEL thing
+%else # EPEL thing
 if [ $1 -eq 1 ] ; then 
    # Initial installation 
    /sbin/chkconfig --add whatsup-pingd
@ -207,8 +200,7 @@ if [ $1 -eq 0 ] ; then
    /bin/systemctl stop whatsup-pingd.service > /dev/null 2>&1 || :
 fi
 %endif
-%else
-# EPEL thing
+%else # EPEL thing
 if [ $1 -eq 0 ] ; then
    # Package removal, not upgrade
    /sbin/service whatsup-pingd stop >/dev/null 2>&1 || :
@ -227,8 +219,7 @@ if [ $1 -ge 1 ] ; then
    /bin/systemctl try-restart whatsup-pingd.service >/dev/null 2>&1 || :
 fi
 %endif
-%else
-#EPEL thing
+%else #EPEL thing
 if [ $1 -ge 1 ] ; then
    # Package upgrade, not uninstall
    /sbin/service whatsup-pingd condrestart
@ -317,94 +308,9 @@ fi


 %changelog
-* Wed Jul 22 2026 Jitka Plesnikova <jplesnik@redhat.com> - 1.14-53
- Perl 5.44 rebuild
-
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-52
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-51
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-50
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jul 07 2025 Jitka Plesnikova <jplesnik@redhat.com> - 1.14-49
- Perl 5.42 rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-48
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.14-47
- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jun 10 2024 Jitka Plesnikova <jplesnik@redhat.com> - 1.14-45
- Perl 5.40 rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.14-42
- Perl 5.38 rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.14-39
- Perl 5.36 rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Nov 26 2021 Petr Pisar <ppisar@redhat.com> - 1.14-37
- Adjust to Autconf-2.71 (bug #1999491)
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.14-35
- Perl 5.34 rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.14-34
- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.14-31
- Perl 5.32 rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.14-28
- Perl 5.30 rebuild
-
-* Fri May 03 2019 Petr Pisar <ppisar@redhat.com> - 1.14-27
+* Fri May 03 2019 Petr Pisar <ppisar@redhat.com> - 1.14-25
 - Disable InfiniBand support on 32-bit ARM architectures (bug #1556539)

-* Mon Apr 22 2019 Björn Esser <besser82@fedoraproject.org> - 1.14-26
- rebuilt(opensm)
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild