From be210aa0c6d3f45a4c729b9626f16c3855e481e1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Tue, 13 Jul 2010 06:43:28 +0000
Subject: [PATCH] Patch Makefile.in directly so we don't need to run autotools.

---
 vhostmd-0.4-link-with-dl.patch | 20 ++++++++++++++++++++
 vhostmd.spec                   | 10 ++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/vhostmd-0.4-link-with-dl.patch b/vhostmd-0.4-link-with-dl.patch
index dc478d2..4f2d68d 100644
--- a/vhostmd-0.4-link-with-dl.patch
+++ b/vhostmd-0.4-link-with-dl.patch
@@ -19,3 +19,23 @@ diff -ur vhostmd-0.4.orig/test/Makefile.am vhostmd-0.4.dso/test/Makefile.am
  if WITH_XENSTORE
  test_dyn_LDADD += -lxenstore
  endif
+--- vhostmd-0.4.orig/test/Makefile.in	2009-12-09 15:26:48.000000000 +0000
++++ vhostmd-0.4/test/Makefile.in	2010-07-13 07:41:38.798675238 +0100
+@@ -194,7 +194,7 @@
+     -I../libmetrics
+ 
+ test_static_SOURCES = main.c
+-test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) \
++test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -ldl \
+ 	$(am__append_1)
+ test_static_DEPENDENCIES = \
+     ../libmetrics/libmetrics.h \
+@@ -202,7 +202,7 @@
+ 
+ test_dyn_SOURCES = main.c
+ test_dyn_CFLAGS = -DUSE_DL_OPEN
+-test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) \
++test_dyn_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -ldl \
+ 	$(am__append_2)
+ test_dyn_DEPENDENCIES = \
+     ../libmetrics/libmetrics.h \
diff --git a/vhostmd.spec b/vhostmd.spec
index 62f9222..9493370 100644
--- a/vhostmd.spec
+++ b/vhostmd.spec
@@ -8,7 +8,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       0.4
-Release:       9%{?dist}
+Release:       10%{?dist}
 License:       GPLv2+
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -25,9 +25,6 @@ Source3:       vhostmd.conf
 # RHBZ#565096.
 Patch0:        vhostmd-0.4-link-with-dl.patch
 
-# Required for patch0 only.
-BuildRequires: autoconf, automake, libtool
-
 BuildRequires: chrpath
 BuildRequires: pkgconfig
 BuildRequires: libxml2-devel
@@ -75,8 +72,6 @@ Header and libraries necessary for metrics gathering development
 %setup -q
 
 %patch0 -p1
-aclocal
-autoreconf
 
 
 %build
@@ -193,6 +188,9 @@ exit 0
 
 
 %changelog
+* Tue Jul 13 2010 Richard W.M. Jones <rjones@redhat.com> - 0.4-10
+- Patch Makefile.in directly so we don't need to run autotools.
+
 * Tue Jul  6 2010 Richard W.M. Jones <rjones@redhat.com> - 0.4-9
 - Updated vhostmd.conf from Dr. Joachim Schneider at SAP.
 - Run aclocal.