From 1a38c039ef059f15f6ad0b679414a929c0aec823 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fdinitto@redhat.com>
Date: Thu, 2 Dec 2010 13:30:45 +0100
Subject: [PATCH] new upstream release

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 .gitignore        |  1 +
 fence-agents.spec | 34 +++++++++++++++++-----------------
 sources           |  2 +-
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 05949e4..cddd66b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ fence-agents-3.0.13.tar.bz2
 fence-agents-3.0.14.tar.bz2
 /fence-agents-3.0.16.tar.bz2
 /fence-agents-3.0.17.tar.bz2
+/fence-agents-3.1.0.tar.xz
diff --git a/fence-agents.spec b/fence-agents.spec
index b58c257..c3a0bd6 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -15,12 +15,12 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 3.0.17
+Version: 3.1.0
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
-URL: http://sources.redhat.com/cluster/wiki/
-Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz2
+URL: http://sourceware.org/cluster/wiki/
+Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.xz
 
 ## Runtime deps
 Requires: sg3_utils telnet openssh-clients
@@ -43,7 +43,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: perl python
 BuildRequires: glibc-devel
 BuildRequires: nss-devel nspr-devel
-BuildRequires: libxml2-devel libvirt-devel
 BuildRequires: libxslt pexpect python-pycurl
 BuildRequires: clusterlib-devel >= 3.0.0
 BuildRequires: corosynclib-devel >= 1.2.0-1
@@ -52,27 +51,19 @@ BuildRequires: openaislib-devel >= 1.1.2-1
 %prep
 %setup -q -n %{name}-%{version}
 
-# we inherit configure from cluster project. Configure it for vars we need.
-# building from source directly without those parameters will NOT work.
-# See http://www.redhat.com/archives/cluster-devel/2009-February/msg00003.html
 %build
-./configure \
-  --sbindir=%{_sbindir} \
-  --initddir=%{_sysconfdir}/rc.d/init.d \
-  --libdir=%{_libdir} \
-  --disable_kernel_check
-
-##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
-# %{_smp_mflags} is broken upstream
-CFLAGS="$(echo '%{optflags}')" make -C fence/agents
+%{configure}
+CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make -C fence/agents install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
 
 ## tree fix up
 # fix libfence permissions
 chmod 0755 %{buildroot}%{_datadir}/fence/*.py
+# remove docs
+rm -rf %{buildroot}/usr/share/doc/fence-agents
 
 %clean
 rm -rf %{buildroot}
@@ -90,6 +81,15 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Thu Dec  2 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.1.0-1
+- new upstream release
+- spec file update:
+  Update upstream URL
+  Update source URL
+  Drop unnecessary BuildRequires
+  use standard configure macro
+  use standard make invokation
+
 * Thu Oct  6 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.17-1
 - new upstream release
   Resolves: rhbz#632595, rhbz#633856, rhbz#632385, rhbz#628013
diff --git a/sources b/sources
index 95f7d46..25076d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c37bf1814f6e0ae8de71e2048ab3bdf  fence-agents-3.0.17.tar.bz2
+6fbccb2f9fc176710a7be7a4726fa27c  fence-agents-3.1.0.tar.xz