From: Daniel P. Berrange <"Daniel P. Berrange "> Date: Fri, 6 Mar 2009 10:21:02 +0000 (+0000) Subject: Update libvirt to 0.6.1 release & remove obsolete patches X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=15b46324f21a5e59a7e005b15edadf788abb546c;p=fedora-mingw.git Update libvirt to 0.6.1 release & remove obsolete patches --- diff --git a/libvirt/libvirt_win_icon_16x16.ico b/libvirt/libvirt_win_icon_16x16.ico deleted file mode 100644 index 38e6d74..0000000 Binary files a/libvirt/libvirt_win_icon_16x16.ico and /dev/null differ diff --git a/libvirt/libvirt_win_icon_32x32.ico b/libvirt/libvirt_win_icon_32x32.ico deleted file mode 100644 index 4d2e7b7..0000000 Binary files a/libvirt/libvirt_win_icon_32x32.ico and /dev/null differ diff --git a/libvirt/libvirt_win_icon_48x48.ico b/libvirt/libvirt_win_icon_48x48.ico deleted file mode 100644 index b03cebf..0000000 Binary files a/libvirt/libvirt_win_icon_48x48.ico and /dev/null differ diff --git a/libvirt/libvirt_win_icon_64x64.ico b/libvirt/libvirt_win_icon_64x64.ico deleted file mode 100644 index c23b664..0000000 Binary files a/libvirt/libvirt_win_icon_64x64.ico and /dev/null differ diff --git a/libvirt/mingw32-libvirt-0.4.6-debug-registration.patch b/libvirt/mingw32-libvirt-0.4.6-debug-registration.patch deleted file mode 100644 index 180f195..0000000 --- a/libvirt/mingw32-libvirt-0.4.6-debug-registration.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libvirt-0.4.6/src/libvirt.c.orig 2008-09-22 14:12:12.000000000 +0100 -+++ libvirt-0.4.6/src/libvirt.c 2008-10-14 15:30:56.000000000 +0100 -@@ -540,6 +540,9 @@ - return -1; - } - -+ DEBUG ("registering %s as driver %d", -+ driver->name, virDriverTabCount); -+ - virDriverTab[virDriverTabCount] = driver; - return virDriverTabCount++; - } diff --git a/libvirt/mingw32-libvirt-0.4.6-register-remote.patch b/libvirt/mingw32-libvirt-0.4.6-register-remote.patch deleted file mode 100644 index 4d0d77d..0000000 --- a/libvirt/mingw32-libvirt-0.4.6-register-remote.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- libvirt-0.4.6/src/libvirt.c.orig 2008-10-14 15:33:00.000000000 +0100 -+++ libvirt-0.4.6/src/libvirt.c 2008-10-14 15:48:54.000000000 +0100 -@@ -297,10 +297,10 @@ - if (lxcRegister() == -1) return -1; - #endif - if (storageRegister() == -1) return -1; -+#endif - #ifdef WITH_REMOTE - if (remoteRegister () == -1) return -1; - #endif --#endif - - return(0); - } diff --git a/libvirt/mingw32-libvirt-0.4.6-win-icon.patch b/libvirt/mingw32-libvirt-0.4.6-win-icon.patch deleted file mode 100644 index 5e16bec..0000000 --- a/libvirt/mingw32-libvirt-0.4.6-win-icon.patch +++ /dev/null @@ -1,84 +0,0 @@ -? docs/libvirt_win_icon_64x64.png -? src/libvirt_win_icon_16x16.ico -? src/libvirt_win_icon_32x32.ico -? src/libvirt_win_icon_48x48.ico -? src/libvirt_win_icon_64x64.ico -Index: configure.in -=================================================================== -RCS file: /data/cvs/libvirt/configure.in,v -retrieving revision 1.171 -diff -u -r1.171 configure.in ---- configure.in 10 Oct 2008 13:57:13 -0000 1.171 -+++ configure.in 15 Oct 2008 16:29:24 -0000 -@@ -34,6 +34,8 @@ - AC_PROG_INSTALL - AC_PROG_CPP - -+AC_OBJEXT -+ - dnl gl_INIT uses m4_foreach_w, yet that is not defined in autoconf-2.59. - dnl In order to accommodate developers with such old tools, here's a - dnl replacement definition. -@@ -1040,6 +1042,10 @@ - AC_SUBST([CYGWIN_EXTRA_PYTHON_LIBADD]) - AC_SUBST([MINGW_EXTRA_LDFLAGS]) - -+dnl Look for windres to build a Windows icon resource. -+AC_CHECK_TOOL([WINDRES], [windres], [no]) -+AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != "no"]) -+ - # Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether - # we're building shared libraries. This is the name of the directory - # in which .o files will be created. -Index: src/Makefile.am -=================================================================== -RCS file: /data/cvs/libvirt/src/Makefile.am,v -retrieving revision 1.95 -diff -u -r1.95 Makefile.am ---- src/Makefile.am 10 Oct 2008 13:57:13 -0000 1.95 -+++ src/Makefile.am 15 Oct 2008 16:29:24 -0000 -@@ -283,6 +283,33 @@ - rm -f $@ - mv $@-tmp $@ - -+if WITH_WIN_ICON -+virsh_LDADD += virsh_win_icon.$(OBJEXT) -+virsh_DEPENDENCIES += virsh_win_icon.$(OBJEXT) -+ -+# Before you edit virsh_win_icon.rc, please note the following -+# limitations of the resource file format: -+# -+# (1) '..' is not permitted in the icon filename field. -+# (2) '-' is not permitted in the icon filename field. -+# (3) Comments are not permitted in the file. -+# -+# Windows appears to choose the first <= 32x32 icon it finds -+# in the resource file. Therefore you should list the available -+# icons from largest to smallest, and make sure that the 32x32 -+# icon is the most legible. -+# -+# Windows .ICO is a special MS-only format. GIMP and other -+# tools can write it. However there are several variations, -+# and Windows seems to do its own colour quantization. More -+# information is needed in this area. -+ -+virsh_win_icon.$(OBJEXT): virsh_win_icon.rc -+ $(WINDRES) \ -+ --input-format rc --input $< \ -+ --output-format coff --output $@ -+endif -+ - libexec_PROGRAMS = - - if WITH_STORAGE_DISK -Index: src/virsh_win_icon.rc -=================================================================== -RCS file: src/virsh_win_icon.rc -diff -N src/virsh_win_icon.rc ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ src/virsh_win_icon.rc 15 Oct 2008 16:29:24 -0000 -@@ -0,0 +1,4 @@ -+xlarge ICON libvirt_win_icon_64x64.ico -+large ICON libvirt_win_icon_48x48.ico -+medium ICON libvirt_win_icon_32x32.ico -+small ICON libvirt_win_icon_16x16.ico diff --git a/libvirt/mingw32-libvirt.spec b/libvirt/mingw32-libvirt.spec index 580321f..28ea035 100644 --- a/libvirt/mingw32-libvirt.spec +++ b/libvirt/mingw32-libvirt.spec @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-libvirt -Version: 0.5.1 -Release: 4%{?dist}%{?extra_release} +Version: 0.6.1 +Release: 1%{?dist}%{?extra_release} Summary: MinGW Windows libvirt virtualization library License: LGPLv2+ @@ -55,8 +55,8 @@ MinGW Windows libvirt virtualization library. --without-xen \ --without-qemu \ --without-lxc \ - --without-openvz \ --without-uml \ + --without-openvz \ --without-libvirtd \ --disable-static make %{?_smp_mflags} @@ -88,6 +88,15 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libvirt.la %{_mingw32_libdir}/pkgconfig/libvirt.pc +%dir %{_mingw32_datadir}/libvirt/ +%dir %{_mingw32_datadir}/libvirt/schemas/ +%{_mingw32_datadir}/libvirt/schemas/domain.rng +%{_mingw32_datadir}/libvirt/schemas/network.rng +%{_mingw32_datadir}/libvirt/schemas/storagepool.rng +%{_mingw32_datadir}/libvirt/schemas/storagevol.rng +%{_mingw32_datadir}/libvirt/schemas/nodedev.rng +%{_mingw32_datadir}/libvirt/schemas/capability.rng + %dir %{_mingw32_includedir}/libvirt %{_mingw32_includedir}/libvirt/libvirt.h %{_mingw32_includedir}/libvirt/virterror.h