New upstream version 0.5.

- Remove -ldl patch which is now upstream.
This commit is contained in:
Richard W.M. Jones 2012-01-16 14:33:30 +00:00
parent 21d41f8728
commit adf7dd5f68
4 changed files with 9 additions and 50 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
vhostmd-0.4.tar.bz2
/vhostmd-0.5.tar.bz2

View File

@ -1 +1 @@
83ae93a53002b09c21654566790261a6 vhostmd-0.4.tar.bz2
db5e80d9a6606ea2394479ef99d30eb8 vhostmd-0.5.tar.bz2

View File

@ -1,41 +0,0 @@
diff -ur vhostmd-0.4.orig/test/Makefile.am vhostmd-0.4.dso/test/Makefile.am
--- vhostmd-0.4.orig/test/Makefile.am 2009-10-13 11:17:39.000000000 +0100
+++ vhostmd-0.4.dso/test/Makefile.am 2010-02-16 15:42:10.102603034 +0000
@@ -5,7 +5,7 @@
noinst_PROGRAMS = test_static test_dyn
test_static_SOURCES = main.c
-test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS)
+test_static_LDADD = ../libmetrics/libmetrics.la $(LIBXML_LIBS) -ldl
if WITH_XENSTORE
test_static_LDADD += -lxenstore
endif
@@ -16,7 +16,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
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 \

View File

@ -7,8 +7,8 @@
Summary: Virtualization host metrics daemon
Name: vhostmd
Version: 0.4
Release: 13%{?dist}
Version: 0.5
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -16,15 +16,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://gitorious.org/vhostmd
# Upstream tarball hosting is screwed at the moment. This release is
# of the 0.4 branch, with 'make dist' done by the packager.
# of the 0.5 branch, with 'make dist' done by the packager.
Source0: vhostmd-%{version}.tar.bz2
Source1: vhostmd.init
Source2: vhostmd.sysconfig
Source3: vhostmd.conf
# RHBZ#565096.
Patch0: vhostmd-0.4-link-with-dl.patch
BuildRequires: chrpath
BuildRequires: pkgconfig
BuildRequires: libxml2-devel
@ -71,8 +68,6 @@ Header and libraries necessary for metrics gathering development
%prep
%setup -q
%patch0 -p1
%build
%configure \
@ -188,6 +183,10 @@ exit 0
%changelog
* Mon Jan 16 2012 Richard W.M. Jones <rjones@redhat.com> - 0.5-1
- New upstream version 0.5.
- Remove -ldl patch which is now upstream.
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild