[mingw-p11-kit/f16] Include MinGW w64 patch to match cross repo.

mooninite mooninite at fedoraproject.org
Wed Nov 23 02:08:50 UTC 2011


commit d4a0c7d8fe28e00b77babf738f5b3ef56aecaf15
Author: Michael Cronenworth <mike at cchtml.com>
Date:   Tue Nov 22 20:08:37 2011 -0600

    Include MinGW w64 patch to match cross repo.
    
    Signed-off-by: Michael Cronenworth <mike at cchtml.com>

 mingw-p11-kit.spec                    |    9 ++++++++-
 p11-kit-mingw-w64-compatibility.patch |   18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/mingw-p11-kit.spec b/mingw-p11-kit.spec
index 93d0846..4c7baaf 100644
--- a/mingw-p11-kit.spec
+++ b/mingw-p11-kit.spec
@@ -4,13 +4,14 @@
 
 Name:           mingw-p11-kit
 Version:        0.9
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Library for loading and sharing PKCS#11 modules
 
 License:        BSD
 Group:          Development/Libraries
 URL:            http://p11-glue.freedesktop.org/p11-kit.html
 Source0:        http://p11-glue.freedesktop.org/releases/p11-kit-%{version}.tar.gz
+Patch0:         p11-kit-mingw-w64-compatibility.patch
 
 BuildArch:      noarch
 
@@ -57,6 +58,8 @@ way that they're discoverable.  This library is cross-compiled for MinGW.
 %prep
 %setup -q -n p11-kit-%{version}
 
+%patch0
+
 
 %build
 %{_mingw32_configure}
@@ -84,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
 
 
 %changelog
+* Wed Nov 16 2011 Michael Cronenworth <mike at cchtml.com> - 0.9-4
+- Include w64 patch.
+- Match release number of cross repo.
+
 * Wed Nov 16 2011 Michael Cronenworth <mike at cchtml.com> - 0.9-1
 - Initial RPM release.
 
diff --git a/p11-kit-mingw-w64-compatibility.patch b/p11-kit-mingw-w64-compatibility.patch
new file mode 100644
index 0000000..35eab34
--- /dev/null
+++ b/p11-kit-mingw-w64-compatibility.patch
@@ -0,0 +1,18 @@
+--- p11-kit/compat.h.orig	2011-11-16 00:22:54.470657049 +0100
++++ p11-kit/compat.h	2011-11-16 00:26:49.970789701 +0100
+@@ -43,8 +43,14 @@
+ 
+ #ifdef OS_WIN32
+ 
++#ifndef _WIN32_WINNT
+ #define _WIN32_WINNT 0x500
+-#define _WIN32_IE 0x400
++#endif
++
++#ifndef _WIN32_IE
++#define _WIN32_IE 0x500
++#endif
++
+ #define WIN32_LEAN_AND_MEAN 1
+ #include <windows.h>
+ 


More information about the scm-commits mailing list