[mingw-p11-kit] Add win64 support

[epienbro]

commit 09f978f96fce4bf65970762f8b09c976a1b0ef1e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Mar 10 21:55:41 2012 +0100

    Add win64 support
    
    Contributed by Michael Cronenworth

 mingw-p11-kit.spec |   72 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 50 insertions(+), 22 deletions(-)
---
diff --git a/mingw-p11-kit.spec b/mingw-p11-kit.spec
index cd24100..42c16d5 100644
--- a/mingw-p11-kit.spec
+++ b/mingw-p11-kit.spec
@@ -1,10 +1,11 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%?mingw_package_header
+
+%global mingw_build_win32 1
+%global mingw_build_win64 1
 
 Name:           mingw-p11-kit
 Version:        0.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Library for loading and sharing PKCS#11 modules
 
 License:        BSD
@@ -14,11 +15,17 @@ Source0:        http://p11-glue.freedesktop.org/releases/p11-kit-%{version}.tar.
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 69
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-gettext
-BuildRequires:  mingw32-iconv
+BuildRequires:  mingw32-win-iconv
+
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-gettext
+BuildRequires:  mingw64-win-iconv
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -32,8 +39,6 @@ BuildRequires:  gettext
 # For native GTK HTML documentation
 BuildRequires:  gtk-doc
 
-Requires:       pkgconfig
-
 
 %description
 p11-kit provides a way to load and enumerate PKCS#11 modules, as well as 
@@ -43,15 +48,24 @@ way that they're discoverable.  This library is cross-compiled for MinGW.
 
 %package -n mingw32-p11-kit
 Summary:        MinGW Library for loading and sharing PKCS#11 modules
-
+Requires:       pkgconfig
 
 %description -n mingw32-p11-kit
 p11-kit provides a way to load and enumerate PKCS#11 modules, as well as 
 a standard configuration setup for installing PKCS#11 modules in such a 
 way that they're discoverable.  This library is cross-compiled for MinGW.
 
+%package -n mingw64-p11-kit
+Summary:        MinGW Library for loading and sharing PKCS#11 modules
+Requires:       pkgconfig
+
+%description -n mingw64-p11-kit
+p11-kit provides a way to load and enumerate PKCS#11 modules, as well as
+a standard configuration setup for installing PKCS#11 modules in such a
+way that they're discoverable.  This library is cross-compiled for MinGW.
 
-%{?_mingw32_debug_package}
+
+%?mingw_debug_package
 
 
 %prep
@@ -59,33 +73,47 @@ way that they're discoverable.  This library is cross-compiled for MinGW.
 
 
 %build
-%{_mingw32_configure}
+%mingw_configure
 # %{?_smp_mflags} doesn't build correctly.
-make V=1
+%mingw_make V=1
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{mingw32_datadir}/info/dir
+rm -f $RPM_BUILD_ROOT%{mingw64_datadir}/info/dir
 
 # Remove .la files
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
+find $RPM_BUILD_ROOT -name "*.la" -delete
 
 # Remove gtk-doc pages which duplicate stuff in Fedora already.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 
 
 %files -n mingw32-p11-kit
 %doc COPYING
-%{_mingw32_bindir}/libp11-kit-0.dll
-%{_mingw32_bindir}/p11-kit.exe
-%{_mingw32_libdir}/libp11-kit.dll.a
-%{_mingw32_libdir}/pkgconfig/p11-kit-1.pc
-%{_mingw32_includedir}/p11-kit-1/
-%{_mingw32_sysconfdir}/pkcs11
+%{mingw32_bindir}/libp11-kit-0.dll
+%{mingw32_bindir}/p11-kit.exe
+%{mingw32_libdir}/libp11-kit.dll.a
+%{mingw32_libdir}/pkgconfig/p11-kit-1.pc
+%{mingw32_includedir}/p11-kit-1/
+%{mingw32_sysconfdir}/pkcs11
+
+%files -n mingw64-p11-kit
+%doc COPYING
+%{mingw64_bindir}/libp11-kit-0.dll
+%{mingw64_bindir}/p11-kit.exe
+%{mingw64_libdir}/libp11-kit.dll.a
+%{mingw64_libdir}/pkgconfig/p11-kit-1.pc
+%{mingw64_includedir}/p11-kit-1/
+%{mingw64_sysconfdir}/pkcs11
 
 
 %changelog
+* Sat Mar 10 2012 Michael Cronenworth <mike at cchtml.com> - 0.10-4
+- Update spec to build 64-bit package.
+
 * Fri Mar 09 2012 Kalev Lember <kalevlember at gmail.com> - 0.10-3
 - Remove .la files