rpms/vhostmd/devel vhostmd-0.4-link-with-dl.patch, 1.1, 1.2 vhostmd.spec, 1.16, 1.17

Richard W.M. Jones rjones at fedoraproject.org
Tue Jul 13 06:43:30 UTC 2010


Author: rjones

Update of /cvs/pkgs/rpms/vhostmd/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30092

Modified Files:
	vhostmd-0.4-link-with-dl.patch vhostmd.spec 
Log Message:
Patch Makefile.in directly so we don't need to run autotools.

vhostmd-0.4-link-with-dl.patch:
 test/Makefile.in                 |    4 ++--
 vhostmd-0.4.dso/test/Makefile.am |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: vhostmd-0.4-link-with-dl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd-0.4-link-with-dl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vhostmd-0.4-link-with-dl.patch	16 Feb 2010 15:44:29 -0000	1.1
+++ vhostmd-0.4-link-with-dl.patch	13 Jul 2010 06:43:28 -0000	1.2
@@ -19,3 +19,23 @@ diff -ur vhostmd-0.4.orig/test/Makefile.
  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 \


Index: vhostmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vhostmd/devel/vhostmd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- vhostmd.spec	6 Jul 2010 17:33:08 -0000	1.16
+++ vhostmd.spec	13 Jul 2010 06:43:28 -0000	1.17
@@ -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 metri
 %setup -q
 
 %patch0 -p1
-aclocal
-autoreconf
 
 
 %build
@@ -193,6 +188,9 @@ exit 0
 
 
 %changelog
+* Tue Jul 13 2010 Richard W.M. Jones <rjones at 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 at redhat.com> - 0.4-9
 - Updated vhostmd.conf from Dr. Joachim Schneider at SAP.
 - Run aclocal.



More information about the scm-commits mailing list