diff --git a/libvirt-0.8.3-daemon-man.patch b/libvirt-0.8.3-daemon-man.patch deleted file mode 100644 index 6652407..0000000 --- a/libvirt-0.8.3-daemon-man.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit e7e9456bb4cce02dda7749434fec431a37a437cf -Author: Diego Elio Pettenò -Date: Fri Aug 6 03:17:37 2010 +0200 - - build-sys: fix build when daemon is disabled by not installing libvirtd.8 - - Since the rule to build libvirtd.8 is within the WITH_LIBVIRTD conditional, - so declare the man page in there as well. Without this change, build - without daemon will fail. - -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index 963d64f..dbf0ac3 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -41,12 +41,12 @@ EXTRA_DIST = \ - $(AVAHI_SOURCES) \ - $(DAEMON_SOURCES) - --man_MANS = libvirtd.8 -- - BUILT_SOURCES = - - if WITH_LIBVIRTD - -+man_MANS = libvirtd.8 -+ - sbin_PROGRAMS = libvirtd - - confdir = $(sysconfdir)/libvirt/ diff --git a/libvirt-0.8.3-qemu-syms.patch b/libvirt-0.8.3-qemu-syms.patch deleted file mode 100644 index 48cf980..0000000 --- a/libvirt-0.8.3-qemu-syms.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit 177e17e4626e18c1ce80f852e5a573ec2530db7c -Author: Matthias Bolte -Date: Thu Aug 12 23:43:16 2010 +0200 - - Generate libvirt_qemu.def from libvirt_qemu.syms for MinGW builds - -diff --git a/configure.ac b/configure.ac -index a2dcfa3..3968617 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1873,6 +1873,7 @@ case "$host" in - # Also set the symbol file to .def, so src/Makefile generates libvirt.def - # from libvirt.syms and passes libvirt.def instead of libvirt.syms to the linker - LIBVIRT_SYMBOL_FILE=libvirt.def -+ LIBVIRT_QEMU_SYMBOL_FILE=libvirt_qemu.def - # mingw's ld has the --version-script parameter, but it requires a .def file - # instead to work properly, therefore clear --version-script here and use - # -Wl, to pass the .def file to the linker -diff --git a/src/Makefile.am b/src/Makefile.am -index a66eb2a..b321657 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1010,7 +1010,7 @@ EXTRA_DIST += \ - libvirt_daemon.syms \ - libvirt_nwfilter.syms - --BUILT_SOURCES += libvirt.syms libvirt.def -+BUILT_SOURCES += libvirt.syms libvirt.def libvirt_qemu.def - - libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) - $(AM_V_GEN)rm -f $@-tmp $@ ; \ -@@ -1033,6 +1033,13 @@ libvirt.def: libvirt.syms - chmod a-w $@-tmp && \ - mv $@-tmp libvirt.def - -+libvirt_qemu.def: $(srcdir)/libvirt_qemu.syms -+ $(AM_V_GEN)rm -f -- $@-tmp $@ ; \ -+ printf 'EXPORTS\n' > $@-tmp && \ -+ sed -e '/^$$/d; /#/d; /:/d; /\}/d; /\*/d; /LIBVIRT_/d; s/[ \t]*\(.*\)\;/ \1/g' $^ >> $@-tmp && \ -+ chmod a-w $@-tmp && \ -+ mv $@-tmp libvirt_qemu.def -+ - # Empty source list - it merely links a bunch of convenience libs together - libvirt_la_SOURCES = - libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE) \ diff --git a/libvirt-0.8.3-remote-protocol.patch b/libvirt-0.8.3-remote-protocol.patch deleted file mode 100644 index 700389f..0000000 --- a/libvirt-0.8.3-remote-protocol.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit b8564da17aafa280fadecdc89c7caefc7addbf93 -Author: Stefan Berger -Date: Tue Aug 17 06:37:27 2010 -0400 - - cygwin: build fix - - Fixing a problem in the build on cygwin due to missing #define's. - -diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c -index 0a33f0b..2483004 100644 ---- a/src/remote/remote_protocol.c -+++ b/src/remote/remote_protocol.c -@@ -16,6 +16,12 @@ - #ifndef IXDR_GET_INT32 - # define IXDR_GET_INT32 IXDR_GET_LONG - #endif -+#ifndef IXDR_PUT_U_INT32 -+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG -+#endif -+#ifndef IXDR_GET_U_INT32 -+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG -+#endif - - bool_t - xdr_remote_nonnull_string (XDR *xdrs, remote_nonnull_string *objp) -diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h -index 4ec0895..afe9287 100644 ---- a/src/remote/remote_protocol.h -+++ b/src/remote/remote_protocol.h -@@ -24,6 +24,12 @@ extern "C" { - #ifndef IXDR_GET_INT32 - # define IXDR_GET_INT32 IXDR_GET_LONG - #endif -+#ifndef IXDR_PUT_U_INT32 -+# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG -+#endif -+#ifndef IXDR_GET_U_INT32 -+# define IXDR_GET_U_INT32 IXDR_GET_U_LONG -+#endif - #define REMOTE_MESSAGE_MAX 262144 - #define REMOTE_MESSAGE_HEADER_MAX 24 - #define REMOTE_MESSAGE_PAYLOAD_MAX 262120 -diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x -index 62450c4..8af469c 100644 ---- a/src/remote/remote_protocol.x -+++ b/src/remote/remote_protocol.x -@@ -51,6 +51,12 @@ - %#ifndef IXDR_GET_INT32 - %# define IXDR_GET_INT32 IXDR_GET_LONG - %#endif -+%#ifndef IXDR_PUT_U_INT32 -+%# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG -+%#endif -+%#ifndef IXDR_GET_U_INT32 -+%# define IXDR_GET_U_INT32 IXDR_GET_U_LONG -+%#endif - - /*----- Data types. -----*/ - diff --git a/libvirt-0.8.5-intl.patch b/libvirt-0.8.5-intl.patch new file mode 100644 index 0000000..0c0293f --- /dev/null +++ b/libvirt-0.8.5-intl.patch @@ -0,0 +1,22 @@ +diff -rup libvirt-0.8.5.orig/configure libvirt-0.8.5.new/configure +--- libvirt-0.8.5.orig/configure 2010-10-29 15:50:29.000000000 +0100 ++++ libvirt-0.8.5.new/configure 2010-12-20 19:23:31.332653324 +0000 +@@ -30065,7 +30065,7 @@ if test "${ac_cv_lib_intl_gettext+set}" + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl $LIBS" ++LIBS="-Wl,-lintl $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -30100,7 +30100,7 @@ if test "x$ac_cv_lib_intl_gettext" = x"" + #define HAVE_LIBINTL 1 + _ACEOF + +- LIBS="-lintl $LIBS" ++ LIBS="-Wl,-lintl $LIBS" + + fi + +Only in libvirt-0.8.5.new/: configure~ diff --git a/mingw32-libvirt.spec b/mingw32-libvirt.spec index e15223f..01a90fe 100644 --- a/mingw32-libvirt.spec +++ b/mingw32-libvirt.spec @@ -7,13 +7,14 @@ Name: mingw32-libvirt Version: 0.8.5 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: MinGW Windows libvirt virtualization library License: LGPLv2+ Group: Development/Libraries URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz +Patch1: libvirt-%{version}-intl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mingw32-filesystem >= 23 @@ -39,7 +40,7 @@ MinGW Windows libvirt virtualization library. %prep %setup -q -n libvirt-%{version} - +%patch1 -p1 %build # XXX enable SASL in future @@ -123,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 20 2010 Daniel P. Berrange - 0.8.5-2 +- Fix linkage against intl.dll + * Fri Dec 17 2010 Daniel P. Berrange - 0.8.5-1 - Update to 0.8.5 release