[whatsup/f16: 10/10] here's a big update with new version of the package
David Brown
dmlb2000 at fedoraproject.org
Wed Jul 25 04:30:41 UTC 2012
commit 8f5870cda6093b71df15d3710310f744c949d6b4
Author: David Brown <david.brown at pnl.gov>
Date: Tue Jul 24 21:27:42 2012 -0700
here's a big update with new version of the package
whatsup.spec | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 deletions(-)
---
diff --git a/whatsup.spec b/whatsup.spec
index ae4a6d9..f7d827e 100644
--- a/whatsup.spec
+++ b/whatsup.spec
@@ -6,11 +6,6 @@
%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.13
@@ -22,8 +17,11 @@ Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{versio
Source1: %{name}-hostsfile
Source2: %{name}-pingd.service
BuildRequires: perl(ExtUtils::MakeMaker) expat-devel
+%if 0%{?fedora} > 15
BuildRequires: systemd-units
+%endif
Requires: %{libname} = %{version}-%{release}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Whatsup is a cluster node up/down detection utility.
@@ -77,10 +75,12 @@ pingd backend module for %{libname}
Summary: Pingd daemon for %{name}
Group: Applications/Communications
Requires: %{libname} = %{version}-%{release}
+%if 0%{?fedora} < 15
Requires(post): systemd-sysv
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
+%endif
%description -n %{name}-pingd
pingd daemon for %{name}
@@ -93,7 +93,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versio
Perl bindings for %{libname}
%{?filter_setup:
-%filter_provides_in %{python_sitearch}/.*\.so$
%filter_provides_in %{perl_vendorarch}/.*\.so$
%filter_setup
}
@@ -130,11 +129,15 @@ chmod +x %{__perl_provides}
%build
-%configure --disable-static
+%configure \
+ --disable-static \
+ --with-perl-extensions \
+ --with-perl-vendor-arch \
+ --with-perl-destdir="%{buildroot}"
make %{?_smpflags}
%install
-make DESTDIR=%{buildroot} install
+DESTDIR=%{buildroot} make install
%if 0%{?fedora} > 15
mkdir -vp %{buildroot}%{_unitdir}
@@ -148,9 +151,6 @@ chmod -x %{buildroot}%{_sysconfdir}/pingd.conf
# for whatsup-pingd
install -m 644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/hostsfile
-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 {} \;
find %{buildroot} -type f -name "*.la" -exec rm -f {} \;
@@ -158,29 +158,50 @@ find %{buildroot} -type f -name "*.la" -exec rm -f {} \;
%{_fixperms} %{buildroot}/*
touch %{buildroot}%{_sysconfdir}/hostsfile
+%if 0%{?rhel} <= 6
+%clean
+rm -rf %{buildroot}
+%endif
+
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%post -n %{name}-pingd
if [ $1 -eq 1 ] ; then
# Initial installation
+%if 0%{?fedora} > 15
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%else
+ /sbin/chkconfig whatsup-pingd on
+%endif
fi
%preun -n %{name}-pingd
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
+%if 0%{?fedora} > 15
/bin/systemctl --no-reload disable whatsup-pingd.service > /dev/null 2>&1 || :
/bin/systemctl stop whatsup-pingd.service > /dev/null 2>&1 || :
+%else
+ /sbin/chkconfig whatsup off
+ /sbin/service whatsup stop
+%endif
fi
%postun -n %{name}-pingd
+%if 0%{?fedora} > 15
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%endif
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
+%if 0%{?fedora} > 15
/bin/systemctl try-restart whatsup-pingd.service >/dev/null 2>&1 || :
+%else
+ /sbin/service whatsup-pingd restart
+%endif
fi
+%if 0%{?fedora} > 15
%triggerun -n %{name}-pingd -- whatsup-pingd < 1.12-6
# Save the current service runlevel info
# User must manually run systemd-sysv-convert --apply whatsup-pingd
@@ -190,14 +211,17 @@ fi
# Run these because the SysV package being removed won't do them
/sbin/chkconfig --del whatsup-pingd >/dev/null 2>&1 || :
/bin/systemctl try-restart whatsup-pingd.service >/dev/null 2>&1 || :
+%endif
%files
+%defattr(-,root,root,-)
%doc AUTHORS COPYING DISCLAIMER NEWS README ChangeLog
%{_bindir}/whatsdown
%{_bindir}/whatsup
%{_mandir}/man1/*
%files -n perl-%{libname}
+%defattr(-,root,root,-)
%doc COPYING
%{_mandir}/man3/Libnodeupdown.3*
%{_mandir}/man3/Nodeupdown.3*
@@ -205,8 +229,13 @@ fi
%exclude %dir %{perl_vendorarch}/auto/
%files -n %{name}-pingd
+%defattr(-,root,root,-)
%doc COPYING
+%if 0%{?fedora} > 15
%{_unitdir}/%{name}-pingd.service
+%else
+%{_sysconfdir}/rc.d/init.d/%{name}-pingd
+%endif
%{_sbindir}/pingd
%dir %{_libdir}/pingd
%{_libdir}/pingd/pingd_clusterlist_hostsfile.so
@@ -216,6 +245,7 @@ fi
%config(noreplace) %{_sysconfdir}/pingd.conf
%files -n %{libname}-devel
+%defattr(-,root,root,-)
%doc COPYING
%{_includedir}/nodeupdown.h
%dir %{_includedir}/nodeupdown
@@ -224,6 +254,7 @@ fi
%{_mandir}/man3/nodeupdown*
%files -n %{libname}
+%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/libnodeupdown*.so.*
%dir %{_libdir}/nodeupdown
@@ -232,20 +263,24 @@ fi
%config(noreplace) %{_sysconfdir}/nodeupdown.conf
%files -n %{libname}-backend-ganglia
+%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/nodeupdown/nodeupdown_backend_ganglia.so
%if %{with_ib}
%files -n %{libname}-backend-openib
+%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/nodeupdown/nodeupdown_backend_openib.so
%endif
%files -n %{libname}-backend-pingd
+%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/nodeupdown/nodeupdown_backend_pingd.so
%files -n %{libname}-clusterlist-hostsfile
+%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/nodeupdown/nodeupdown_clusterlist_hostsfile.so
%config(noreplace) %{_sysconfdir}/hostsfile
@@ -254,6 +289,7 @@ fi
%changelog
* Tue Jul 24 2012 David Brown <david.brown at pnnl.gov> - 1.13-1
- New Upstream Release
+- Made one spec file to rule them all ... at least el5 el6 f17 f16
* 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