[whatsup/el5: 27/31] here's an updated version of whatsup from upstream seems they applied some of our patches
David Brown
dmlb2000 at fedoraproject.org
Wed Jul 25 04:28:42 UTC 2012
commit c263781946c107eb35a73136f8238cc33c48bdac
Author: David Brown <david.brown at pnl.gov>
Date: Tue Jul 24 10:48:32 2012 -0700
here's an updated version of whatsup from upstream
seems they applied some of our patches
whatsup.spec | 59 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 12 deletions(-)
---
diff --git a/whatsup.spec b/whatsup.spec
index 0af85c4..ae4a6d9 100644
--- a/whatsup.spec
+++ b/whatsup.spec
@@ -6,19 +6,21 @@
%global with_ib 0
%endif
+%if 0%{?rhel} <= 5
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
Summary: Node up/down detection utility
Name: whatsup
-Version: 1.12
-Release: 10%{?dist}
+Version: 1.13
+Release: 1%{?dist}
Group: Applications/Communications
License: GPLv2+
URL: https://computing.llnl.gov/linux/whatsup.html
-Source0: http://master.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}-1/%{name}-%{version}.tar.gz
Source1: %{name}-hostsfile
Source2: %{name}-pingd.service
-Patch0: %{name}-move-initscript.patch
-Patch1: %{name}-fix-initscript.patch
-Patch2: %{name}-install-into-vendorarch.patch
BuildRequires: perl(ExtUtils::MakeMaker) expat-devel
BuildRequires: systemd-units
Requires: %{libname} = %{version}-%{release}
@@ -90,6 +92,12 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versio
%description -n perl-%{libname}
Perl bindings for %{libname}
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/.*\.so$
+%filter_provides_in %{perl_vendorarch}/.*\.so$
+%filter_setup
+}
+
%package -n %{libname}-clusterlist-hostsfile
Summary: Hostsfile clusterlist module for %{libname}
Group: Applications/Communications
@@ -99,9 +107,27 @@ Hostsfile clusterlist module for %{libname}
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+
+%if 0%{?rhel} <= 6
+cat << \EOF > %{name}-python-prov
+#!/bin/sh
+%{__python_provides} $* |\
+sed -e '/.*Lib%{name}.so.*/d'
+EOF
+
+%global __python_provides %{_builddir}/%{name}-%{version}/%{name}-python-prov
+chmod +x %{__python_provides}
+
+cat << \EOF > %{name}-perl-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+sed -e '/.*Lib%{name}.so.*/d'
+EOF
+
+%global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl-prov
+chmod +x %{__perl_provides}
+%endif
+
%build
%configure --disable-static
@@ -110,14 +136,20 @@ make %{?_smpflags}
%install
make DESTDIR=%{buildroot} install
+%if 0%{?fedora} > 15
mkdir -vp %{buildroot}%{_unitdir}
install -m 644 -p %{SOURCE2} %{buildroot}%{_unitdir}/
rm -rf %{buildroot}%{_initrddir}
+%endif
+
+chmod -x %{buildroot}%{_sysconfdir}/nodeupdown.conf
+chmod -x %{buildroot}%{_sysconfdir}/pingd.conf
# for whatsup-pingd
install -m 644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/hostsfile
-mkdir -vp %{buildroot}%{perl_vendorlib}
+mkdir -vp %{buildroot}%{perl_vendorarch}
+mv -v %{buildroot}%{_libdir}/perl5/auto %{buildroot}%{_libdir}/perl5/*.pm %{buildroot}%{perl_vendorarch}/
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name "*.bs" -exec rm -f {} \;
@@ -181,7 +213,7 @@ fi
%config(noreplace) %{_sysconfdir}/hostsfile
%{_mandir}/man5/pingd.conf.5*
%{_mandir}/man8/pingd.8*
-%{_sysconfdir}/pingd.conf
+%config(noreplace) %{_sysconfdir}/pingd.conf
%files -n %{libname}-devel
%doc COPYING
@@ -197,7 +229,7 @@ fi
%dir %{_libdir}/nodeupdown
%{_mandir}/man3/libnodeupdown.3*
%{_mandir}/man5/nodeupdown.conf.5*
-%{_sysconfdir}/nodeupdown.conf
+%config(noreplace) %{_sysconfdir}/nodeupdown.conf
%files -n %{libname}-backend-ganglia
%doc COPYING
@@ -220,6 +252,9 @@ fi
%changelog
+* Tue Jul 24 2012 David Brown <david.brown at pnnl.gov> - 1.13-1
+- New Upstream Release
+
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list