X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libvirt%2Fmingw32-libvirt.spec;h=a21ee7b9e7a78db3b8189827016a3ff1158072ae;hb=b40f98132763934a242c123f613f1df44aed01a6;hp=0cc69a87cb31058769d02f911aacb50857a6b406;hpb=14bb5f7a7a8110b0c21eef08c532bd7f18c42e8e;p=fedora-mingw.git

diff --git a/libvirt/mingw32-libvirt.spec b/libvirt/mingw32-libvirt.spec
index 0cc69a8..a21ee7b 100644
--- a/libvirt/mingw32-libvirt.spec
+++ b/libvirt/mingw32-libvirt.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-libvirt
 Version:        0.4.6
-Release:        1%{?dist}%{?extra_release}
+Release:        8%{?dist}%{?extra_release}
 Summary:        MinGW Windows libvirt virtualization library
 
 License:        LGPLv2+
@@ -15,6 +15,15 @@ URL:            http://libvirt.org/
 Source0:        ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# All of these patches are upstream after 0.4.6.
+Patch0:         mingw32-libvirt-0.4.6-debug-registration.patch
+Patch1:         mingw32-libvirt-0.4.6-register-remote.patch
+Patch2:         mingw32-libvirt-0.4.6-win-icon.patch
+Source1:        libvirt_win_icon_16x16.ico
+Source2:        libvirt_win_icon_32x32.ico
+Source3:        libvirt_win_icon_48x48.ico
+Source4:        libvirt_win_icon_64x64.ico
+
 BuildRequires:  mingw32-filesystem >= 23
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
@@ -23,17 +32,35 @@ BuildRequires:  mingw32-libgcrypt
 BuildRequires:  mingw32-gnutls
 BuildRequires:  mingw32-gettext
 BuildRequires:  mingw32-libxml2
-BuildRequires:  mingw32-portablexdr
+# Portable XDR <= 4.0.10 contains a serious endianness bug on Windows.
+BuildRequires:  mingw32-portablexdr >= 4.0.11
+BuildRequires:  mingw32-readline
+BuildRequires:  mingw32-termcap >= 1.3.1-3
 BuildRequires:  pkgconfig
+
 # Need native version for msgfmt
 BuildRequires:  gettext
 
+# For autoreconf.
+BuildRequires:  autoconf, automake, libtool
+
+BuildArch:      noarch
+
+
 %description
 MinGW Windows libvirt virtualization library.
 
 
 %prep
 %setup -q -n libvirt-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p0
+cp %{SOURCE1} src/
+cp %{SOURCE2} src/
+cp %{SOURCE3} src/
+cp %{SOURCE4} src/
+autoreconf
 
 
 %build
@@ -56,9 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm -rf $RPM_BUILD_ROOT/%{_mingw32_sysconfdir}/libvirt
-rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/doc/*
-rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc/*
+rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/libvirt
+rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/*
+rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/*
 
 rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libvirt.a
 
@@ -86,6 +113,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 31 2008 Richard Jones <rjones@redhat.com> - 0.4.6-8
+- Rebuild against latest termcap.
+
+* Thu Oct 16 2008 Richard Jones <rjones@redhat.com> - 0.4.6-7
+- Windows icon patch from
+  https://www.redhat.com/archives/libvir-list/2008-October/msg00331.html
+
+* Wed Oct 15 2008 Richard Jones <rjones@redhat.com> - 0.4.6-6
+- Add patches from
+  https://www.redhat.com/archives/libvir-list/2008-October/msg00328.html
+- BR mingw32-portablexdr >= 4.0.11 to fix serious Windows endianness bug.
+
+* Tue Oct 14 2008 Richard Jones <rjones@redhat.com> - 0.4.6-4
+- +BR mingw32-readline.
+
+* Thu Sep 25 2008 Richard Jones <rjones@redhat.com> - 0.4.6-3
+- BuildArch should be noarch
+
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.6-2
+- Whitespace removal.
+
 * Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.6-1
 - New upstream release 0.4.6.
 - Rename mingw -> mingw32.