X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libvirt%2Fmingw-libvirt.spec;h=388546faa577cf3ddb52df26f8bcaedf7abf10a7;hb=be493b06c00d31898b17d3949a5e34def1fb6e6a;hp=30826702a2bc929ddc549a2ab31315e4040a7509;hpb=e0a0296e132f4b0201da0d5d8cb8aa3026a0273b;p=fedora-mingw.git

diff --git a/libvirt/mingw-libvirt.spec b/libvirt/mingw-libvirt.spec
index 3082670..388546f 100644
--- a/libvirt/mingw-libvirt.spec
+++ b/libvirt/mingw-libvirt.spec
@@ -1,29 +1,33 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%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.4
-Release:        2%{?dist}
+Version:        0.4.5
+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 >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libgpg-error
 BuildRequires:  mingw-libgcrypt
 BuildRequires:  mingw-gnutls
+BuildRequires:  mingw-gettext
 BuildRequires:  mingw-libxml2
 BuildRequires:  mingw-portablexdr
-
-Requires:       mingw-runtime
-Requires:       mingw-libgpg-error
-Requires:       mingw-libgcrypt
-Requires:       mingw-gnutls
-Requires:       mingw-libxml2
+BuildRequires:  pkgconfig
+# Need native version for msgfmt
+BuildRequires:  gettext
 
 %description
 MinGW Windows libvirt virtualization library.
@@ -31,20 +35,20 @@ MinGW Windows libvirt virtualization library.
 
 %prep
 %setup -q -n libvirt-%{version}
-
+%patch1 -p1
 
 %build
-PKG_CONFIG_PATH="%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig" \
-CC="i686-pc-mingw32-gcc" \
-CFLAGS="-O2 -g -Wall -pipe" \
-./configure \
-  --build=%_build \
-  --host=i686-pc-mingw32 \
-  --prefix=%{_prefix}/i686-pc-mingw32/sys-root/mingw \
-  --without-xen --without-qemu --without-libvirtd \
-  --without-sasl
-# XXX Should include SASL, and maybe polkit?
-
+# XXX enable SASL in future
+%{_mingw_configure} \
+  --without-sasl \
+  --without-avahi \
+  --without-polkit \
+  --without-python \
+  --without-xen \
+  --without-qemu \
+  --without-lxc \
+  --without-openvz \
+  --without-libvirtd
 make
 
 
@@ -53,6 +57,12 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+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
@@ -60,18 +70,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/*
+%{_mingw_bindir}/libvirt-0.dll
+%{_mingw_bindir}/virsh.exe
+
+%{_mingw_libdir}/libvirt.dll.a
+%{_mingw_libdir}/libvirt.la
+%{_mingw_libdir}/pkgconfig/libvirt.pc
+
+%{_mingw_datadir}/locale/*/LC_MESSAGES/libvirt.mo
+
+%dir %{_mingw_includedir}/libvirt
+%{_mingw_includedir}/libvirt/libvirt.h
+%{_mingw_includedir}/libvirt/virterror.h
+
+%{_mingw_mandir}/man1/virsh.1*
 
 
 %changelog
-* Tue Sep  2 2008  <berrange@li15-219.members.linode.com> - 0.4.4-2
-- Add BR on portablexdr, set PKG_CONFIG_PATH for libxml/gnutls, set CFLAGS
+* 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.
 
-* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.4-1
+* 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.