From 6bb4ab01ccb19d7f08a2e273cf5ea5927aa45432 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange@redhat.com>
Date: Jan 20 2016 14:11:32 +0000
Subject: Update to 1.3.1 release


---

diff --git a/mingw-libvirt.spec b/mingw-libvirt.spec
index 333eeb9..5c3d35e 100644
--- a/mingw-libvirt.spec
+++ b/mingw-libvirt.spec
@@ -3,7 +3,7 @@
 # Default to skipping autoreconf.  Distros can change just this one line
 # (or provide a command-line override) if they backport any patches that
 # touch configure.ac or Makefile.am.
-%{!?enable_autotools:%define enable_autotools 0}
+%{!?enable_autotools:%global enable_autotools 1}
 
 # The mingw build is client only.  Set up defaults for hypervisor drivers
 # that talk via a native remote protocol, and for which prereq mingw
@@ -13,7 +13,7 @@
 # missing libwsman, so can't build hyper-v
 %define with_hyperv        0%{!?_without_hyperv:0}
 %define with_xenapi        0%{!?_without_xenapi:1}
-%define with_parallels           0%{!?_without_parallels:0}
+%define with_vz            0%{!?_without_vz:0}
 
 # RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi)
 %if 0%{?rhel}
@@ -23,14 +23,15 @@
 %endif
 
 Name:           mingw-libvirt
-Version:        1.2.16
-Release:        2%{?dist}%{?extra_release}
+Version:        1.3.1
+Release:        1%{?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: 0001-docs-fix-generation-of-docs-from-VPATH-build.patch
 
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw64-filesystem >= 95
@@ -108,6 +109,7 @@ MinGW Windows libvirt virtualization library, static version.
 
 %prep
 %setup -q -n libvirt-%{version}
+%patch1 -p1
 
 %build
 %if ! %{with_phyp}
@@ -126,8 +128,8 @@ MinGW Windows libvirt virtualization library, static version.
     %define _without_xenapi --without-xenapi
 %endif
 
-%if ! %{with_parallels}
-    %define _without_parallels --without-parallels
+%if ! %{with_vz}
+    %define _without_vz --without-vz
 %endif
 
 %if 0%{?enable_autotools}
@@ -152,7 +154,7 @@ autoreconf -if
   %{?_without_esx} \
   %{?_without_hyperv} \
   --without-vmware \
-  --without-parallels \
+  %{?_without_vz} \
   --without-netcf \
   --without-audit \
   --without-dtrace \
@@ -179,6 +181,21 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt_iohelper.exe
 rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt-guests.sh
 rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 
+# Temporarily get rid of not-installed admin-related files
+rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/libvirt-admin-0.dll
+rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/virt-admin.exe
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libvirt-admin.a
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libvirt-admin.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw32_mandir}/man1/virt-admin.1*
+rm -f $RPM_BUILD_ROOT%{mingw32_sysconfdir}/libvirt/libvirt-admin.conf
+
+rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/libvirt-admin-0.dll
+rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/virt-admin.exe
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libvirt-admin.a
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libvirt-admin.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw64_mandir}/man1/virt-admin.1*
+rm -f $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/libvirt-admin.conf
+
 
 # Mingw32
 %files -n mingw32-libvirt
@@ -229,6 +246,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 
 %dir %{mingw32_includedir}/libvirt
 %{mingw32_includedir}/libvirt/libvirt.h
+%{mingw32_includedir}/libvirt/libvirt-common.h
 %{mingw32_includedir}/libvirt/libvirt-domain.h
 %{mingw32_includedir}/libvirt/libvirt-domain-snapshot.h
 %{mingw32_includedir}/libvirt/libvirt-event.h
@@ -303,6 +321,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 
 %dir %{mingw64_includedir}/libvirt
 %{mingw64_includedir}/libvirt/libvirt.h
+%{mingw64_includedir}/libvirt/libvirt-common.h
 %{mingw64_includedir}/libvirt/libvirt-domain.h
 %{mingw64_includedir}/libvirt/libvirt-domain-snapshot.h
 %{mingw64_includedir}/libvirt/libvirt-event.h
@@ -330,6 +349,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
 
 
 %changelog
+* Wed Jan 20 2016 Daniel P. Berrange <berrange@redhat.com> - 1.3.1-1
+- Update to 1.3.1 release
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 4247905..f064258 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-015b0aa29c7868916f7b32c9ee70ef60  libvirt-1.2.16.tar.gz
+1d49377bb471df214e2dc660e7411361  libvirt-1.3.1.tar.gz