X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libvirt%2Fmingw32-libvirt.spec;h=28ea035bc39d22f2d78f201f776e52298d09e5eb;hb=fe3ca3d2cf684751b9943bf498b296e36e9e260d;hp=b3ae697d2c5bfd7d874bace70f3eb3301cf469ca;hpb=e40fc6b6d65ae3bbdd712161f19d00d3c2e35fd5;p=fedora-mingw.git

diff --git a/libvirt/mingw32-libvirt.spec b/libvirt/mingw32-libvirt.spec
index b3ae697..28ea035 100644
--- a/libvirt/mingw32-libvirt.spec
+++ b/libvirt/mingw32-libvirt.spec
@@ -5,8 +5,8 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-libvirt
-Version:        0.4.6
-Release:        9%{?dist}%{?extra_release}
+Version:        0.6.1
+Release:        1%{?dist}%{?extra_release}
 Summary:        MinGW Windows libvirt virtualization library
 
 License:        LGPLv2+
@@ -15,15 +15,6 @@ 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
@@ -41,11 +32,10 @@ BuildRequires:  pkgconfig
 # Need native version for msgfmt
 BuildRequires:  gettext
 
-# For autoreconf.
-BuildRequires:  autoconf, automake, libtool
-
 BuildArch:      noarch
 
+Requires:       pkgconfig
+
 
 %description
 MinGW Windows libvirt virtualization library.
@@ -53,14 +43,6 @@ 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
@@ -73,9 +55,11 @@ autoreconf
   --without-xen \
   --without-qemu \
   --without-lxc \
+  --without-uml \
   --without-openvz \
-  --without-libvirtd
-make
+  --without-libvirtd \
+  --disable-static
+make %{?_smp_mflags}
 
 
 %install
@@ -87,15 +71,16 @@ 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
+%find_lang libvirt
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f libvirt.lang
 %defattr(-,root,root)
+%doc COPYING.LIB
 %{_mingw32_bindir}/libvirt-0.dll
 %{_mingw32_bindir}/virsh.exe
 
@@ -103,7 +88,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libvirt.la
 %{_mingw32_libdir}/pkgconfig/libvirt.pc
 
-%{_mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo
+%dir %{_mingw32_datadir}/libvirt/
+%dir %{_mingw32_datadir}/libvirt/schemas/
+%{_mingw32_datadir}/libvirt/schemas/domain.rng
+%{_mingw32_datadir}/libvirt/schemas/network.rng
+%{_mingw32_datadir}/libvirt/schemas/storagepool.rng
+%{_mingw32_datadir}/libvirt/schemas/storagevol.rng
+%{_mingw32_datadir}/libvirt/schemas/nodedev.rng
+%{_mingw32_datadir}/libvirt/schemas/capability.rng
 
 %dir %{_mingw32_includedir}/libvirt
 %{_mingw32_includedir}/libvirt/libvirt.h
@@ -113,6 +105,24 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 20 2009 Richard W.M. Jones <rjones@redhat.com> - 0.5.1-4
+- Rebuild for mingw32-gcc 4.4
+
+* Fri Jan 30 2009 Richard Jones <rjones@redhat.com> - 0.5.1-3
+- Include license file.
+
+* Fri Jan 30 2009 Richard Jones <rjones@redhat.com> - 0.5.1-2
+- Requires pkgconfig.
+
+* Fri Jan 23 2009 Richard Jones <rjones@redhat.com> - 0.5.1-1
+- Rebase to Fedora native version 0.5.1.
+- Use find_lang macro.
+- Use _smp_mflags.
+- Disable static libraries.
+
+* Wed Nov 26 2008 Richard Jones <rjones@redhat.com> - 0.5.0-1
+- New upstream version 0.5.0.
+
 * Sat Nov 22 2008 Richard Jones <rjones@redhat.com> - 0.4.6-9
 - Rebuild against new readline.