X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=libvirt%2Fmingw-libvirt.spec;h=388546faa577cf3ddb52df26f8bcaedf7abf10a7;hb=c290098c415554af6e67e1d46e7db8da052a1b37;hp=eb8456ec78b2db6780d42c93a8f4ae75ceb180de;hpb=2e1b8617ce0ac4fe1574cb5caedd2296cd481ef5;p=fedora-mingw.git

diff --git a/libvirt/mingw-libvirt.spec b/libvirt/mingw-libvirt.spec
index eb8456e..388546f 100644
--- a/libvirt/mingw-libvirt.spec
+++ b/libvirt/mingw-libvirt.spec
@@ -1,17 +1,22 @@
-%include        /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-libvirt
 Version:        0.4.5
-Release:        1%{?dist}%{?extra_release}
+Release:        4%{?dist}%{?extra_release}
 Summary:        MinGW Windows libvirt virtualization library
 
 License:        LGPLv2+
 Group:          Development/Libraries
-URL:            http://www.libvirt.org/
+URL:            http://libvirt.org/
 Source0:        ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz
+Patch1:         libvirt-%{version}-no-emulator-segfault.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libgpg-error
@@ -20,6 +25,9 @@ BuildRequires:  mingw-gnutls
 BuildRequires:  mingw-gettext
 BuildRequires:  mingw-libxml2
 BuildRequires:  mingw-portablexdr
+BuildRequires:  pkgconfig
+# Need native version for msgfmt
+BuildRequires:  gettext
 
 %description
 MinGW Windows libvirt virtualization library.
@@ -27,7 +35,7 @@ MinGW Windows libvirt virtualization library.
 
 %prep
 %setup -q -n libvirt-%{version}
-
+%patch1 -p1
 
 %build
 # XXX enable SASL in future
@@ -53,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT/%{_mingw_sysconfdir}/libvirt
 rm -rf $RPM_BUILD_ROOT/%{_mingw_datadir}/doc/*
 rm -rf $RPM_BUILD_ROOT/%{_mingw_datadir}/gtk-doc/*
 
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libvirt.a
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -62,7 +73,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_bindir}/libvirt-0.dll
 %{_mingw_bindir}/virsh.exe
 
-%{_mingw_libdir}/libvirt.a
 %{_mingw_libdir}/libvirt.dll.a
 %{_mingw_libdir}/libvirt.la
 %{_mingw_libdir}/pkgconfig/libvirt.pc
@@ -77,5 +87,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.5-4%{?extra_release}
+- Import crash fix from rawhide
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.5-3%{?extra_release}
+- Add dep on gettext & pkgconfig
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-2
+- Remove static lib.
+
 * Tue Sep  2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.4-1
 - Initial RPM release, largely based on earlier work from several sources.