[mingw-libvirt: 5/22] Fix linkage against intl.dll & remove obsolete patches

[Kalev Lember]

commit 54ec9c5b6087372e2f0c18bacb70ca5416aa591e
Author: Daniel P. Berrange <dan at berrange.com>
Date:   Mon Dec 20 19:30:57 2010 +0000

    Fix linkage against intl.dll & remove obsolete patches

 libvirt-0.8.3-daemon-man.patch      |   29 -----------------
 libvirt-0.8.3-qemu-syms.patch       |   45 --------------------------
 libvirt-0.8.3-remote-protocol.patch |   59 -----------------------------------
 libvirt-0.8.5-intl.patch            |   22 +++++++++++++
 mingw32-libvirt.spec                |    8 +++-
 5 files changed, 28 insertions(+), 135 deletions(-)
---
diff --git a/libvirt-0.8.5-intl.patch b/libvirt-0.8.5-intl.patch
new file mode 100644
index 0000000..0c0293f
--- /dev/null
+++ b/libvirt-0.8.5-intl.patch
@@ -0,0 +1,22 @@
+diff -rup libvirt-0.8.5.orig/configure libvirt-0.8.5.new/configure
+--- libvirt-0.8.5.orig/configure	2010-10-29 15:50:29.000000000 +0100
++++ libvirt-0.8.5.new/configure	2010-12-20 19:23:31.332653324 +0000
+@@ -30065,7 +30065,7 @@ if test "${ac_cv_lib_intl_gettext+set}" 
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lintl  $LIBS"
++LIBS="-Wl,-lintl  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -30100,7 +30100,7 @@ if test "x$ac_cv_lib_intl_gettext" = x""
+ #define HAVE_LIBINTL 1
+ _ACEOF
+ 
+-  LIBS="-lintl $LIBS"
++  LIBS="-Wl,-lintl $LIBS"
+ 
+ fi
+ 
+Only in libvirt-0.8.5.new/: configure~
diff --git a/mingw32-libvirt.spec b/mingw32-libvirt.spec
index e15223f..01a90fe 100644
--- a/mingw32-libvirt.spec
+++ b/mingw32-libvirt.spec
@@ -7,13 +7,14 @@
 
 Name:           mingw32-libvirt
 Version:        0.8.5
-Release:        1%{?dist}%{?extra_release}
+Release:        2%{?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}-intl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mingw32-filesystem >= 23
@@ -39,7 +40,7 @@ MinGW Windows libvirt virtualization library.
 
 %prep
 %setup -q -n libvirt-%{version}
-
+%patch1 -p1
 
 %build
 # XXX enable SASL in future
@@ -123,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 20 2010 Daniel P. Berrange <berrange at redhat.com> - 0.8.5-2
+- Fix linkage against intl.dll
+
 * Fri Dec 17 2010 Daniel P. Berrange <berrange at redhat.com> - 0.8.5-1
 - Update to 0.8.5 release