diff --git a/.cvsignore b/.cvsignore index 825e764..e944398 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fence-agents-3.0.0.beta1.tar.gz +fence-agents-3.0.0.rc1.tar.gz diff --git a/fence-agents.spec b/fence-agents.spec index 3ee20c1..d41ec8e 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -14,12 +14,12 @@ # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html # keep around ready for later user -%define alphatag beta1 +%define alphatag rc1 Name: fence-agents Summary: Fence Agents for Red Hat Cluster Version: 3.0.0 -Release: 9%{?alphatag:.%{alphatag}}%{?dist} +Release: 10%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sources.redhat.com/cluster/wiki/ @@ -37,17 +37,17 @@ Requires: pexpect net-snmp-utils pyOpenSSL %define buildvirt 1 %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # Build dependencies BuildRequires: perl python BuildRequires: glibc-devel -BuildRequires: libxml2-devel -BuildRequires: clusterlib-devel >= 3.0.0 -BuildRequires: corosynclib-devel >= 0.94-3 -BuildRequires: openaislib-devel >= 0.93-2 %if %{buildvirt} +BuildRequires: libxml2-devel +BuildRequires: clusterlib-devel >= 3.0.0 +BuildRequires: corosynclib-devel >= 0.95-1 +BuildRequires: openaislib-devel >= 0.94-1 BuildRequires: nss-devel nspr-devel libvirt-devel %endif @@ -64,9 +64,8 @@ BuildRequires: nss-devel nspr-devel libvirt-devel --libdir=%{_libdir} \ %if %{buildvirt} --enable_virt \ -%endif - --corosynclibdir=%{_libdir}/corosync \ --openaislibdir=%{_libdir}/openais \ +%endif --disable_kernel_check ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags} @@ -74,17 +73,17 @@ BuildRequires: nss-devel nspr-devel libvirt-devel CFLAGS="$(echo '%{optflags}')" make -C fence/agents %install -rm -rf $RPM_BUILD_ROOT -make -C fence/agents install DESTDIR=$RPM_BUILD_ROOT -make -C fence/man install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make -C fence/agents install DESTDIR=%{buildroot} +make -C fence/man install DESTDIR=%{buildroot} ## tree fix up # fix libfence permissions -chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/*.py -chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/telnet_ssl +chmod 0755 %{buildroot}%{_datadir}/fence/*.py +chmod 0755 %{buildroot}%{_datadir}/fence/telnet_ssl %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %description Red Hat Fence Agents is a collection of scripts to handle remote @@ -95,10 +94,16 @@ power management for several devices. %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence %{_sbindir}/fence* %{_datadir}/fence -%{_datadir}/snmp/mibs/* %{_mandir}/man8/fence* %changelog +* Tue Mar 24 2009 Fabio M. Di Nitto - 3.0.0-10.rc1 +- New upstream release. +- Cleanup BuildRequires to avoid to pull in tons of stuff when it's not + required. +- Update BuildRoot usage to preferred versions/names. +- Stop shipping powermib. Those are not required for operations anymore. + * Thu Mar 12 2009 Fabio M. Di Nitto - 3.0.0-9.beta1 - Fix arch check for virt support. - Drop unrequired BuildRequires. diff --git a/sources b/sources index 4a02f47..8e0e9fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85f5b2d70ec9fcccbf84d20b9016fe82 fence-agents-3.0.0.beta1.tar.gz +a680218a4d297608232f51281445e150 fence-agents-3.0.0.rc1.tar.gz