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

diff --git a/libvirt/mingw-libvirt.spec b/libvirt/mingw32-libvirt.spec
similarity index 51%
rename from libvirt/mingw-libvirt.spec
rename to libvirt/mingw32-libvirt.spec
index 388546f..0cc69a8 100644
--- a/libvirt/mingw-libvirt.spec
+++ b/libvirt/mingw32-libvirt.spec
@@ -1,30 +1,29 @@
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
 %define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
 
-Name:           mingw-libvirt
-Version:        0.4.5
-Release:        4%{?dist}%{?extra_release}
+Name:           mingw32-libvirt
+Version:        0.4.6
+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:         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
+BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-libgpg-error
+BuildRequires:  mingw32-libgcrypt
+BuildRequires:  mingw32-gnutls
+BuildRequires:  mingw32-gettext
+BuildRequires:  mingw32-libxml2
+BuildRequires:  mingw32-portablexdr
 BuildRequires:  pkgconfig
 # Need native version for msgfmt
 BuildRequires:  gettext
@@ -35,11 +34,11 @@ MinGW Windows libvirt virtualization library.
 
 %prep
 %setup -q -n libvirt-%{version}
-%patch1 -p1
+
 
 %build
 # XXX enable SASL in future
-%{_mingw_configure} \
+%{_mingw32_configure} \
   --without-sasl \
   --without-avahi \
   --without-polkit \
@@ -57,11 +56,11 @@ 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 -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%{_mingw_libdir}/libvirt.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libvirt.a
 
 
 %clean
@@ -70,23 +69,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_mingw_bindir}/libvirt-0.dll
-%{_mingw_bindir}/virsh.exe
+%{_mingw32_bindir}/libvirt-0.dll
+%{_mingw32_bindir}/virsh.exe
 
-%{_mingw_libdir}/libvirt.dll.a
-%{_mingw_libdir}/libvirt.la
-%{_mingw_libdir}/pkgconfig/libvirt.pc
+%{_mingw32_libdir}/libvirt.dll.a
+%{_mingw32_libdir}/libvirt.la
+%{_mingw32_libdir}/pkgconfig/libvirt.pc
 
-%{_mingw_datadir}/locale/*/LC_MESSAGES/libvirt.mo
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo
 
-%dir %{_mingw_includedir}/libvirt
-%{_mingw_includedir}/libvirt/libvirt.h
-%{_mingw_includedir}/libvirt/virterror.h
+%dir %{_mingw32_includedir}/libvirt
+%{_mingw32_includedir}/libvirt/libvirt.h
+%{_mingw32_includedir}/libvirt/virterror.h
 
-%{_mingw_mandir}/man1/virsh.1*
+%{_mingw32_mandir}/man1/virsh.1*
 
 
 %changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.6-1
+- New upstream release 0.4.6.
+- Rename mingw -> mingw32.
+
 * Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.5-4%{?extra_release}
 - Import crash fix from rawhide