[mingw-gnutls] Added win64 support and dropped .def files

[epienbro]

commit fab138b6955ecb2feff63866f57e209e83bea2f2
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Mar 11 17:39:48 2012 +0100

    Added win64 support and dropped .def files

 mingw-gnutls.spec |   90 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 70 insertions(+), 20 deletions(-)
---
diff --git a/mingw-gnutls.spec b/mingw-gnutls.spec
index b62a661..251d1fe 100644
--- a/mingw-gnutls.spec
+++ b/mingw-gnutls.spec
@@ -1,6 +1,7 @@
-%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-gnutls
 Version:        2.12.14
@@ -27,18 +28,30 @@ Patch4: gnutls-2.12.7-dsa-skiptests.patch
 # MinGW-specific patches.
 Patch1001:      gnutls-mingw-compile-fix.patch
 
-BuildRequires:  mingw32-filesystem >= 40
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-libgpg-error
-BuildRequires:  mingw32-libgcrypt >= 1.2.2
+BuildRequires:  mingw32-libgcrypt
 BuildRequires:  mingw32-gettext
 BuildRequires:  mingw32-win-iconv
 BuildRequires:  mingw32-readline
 BuildRequires:  mingw32-zlib
 BuildRequires:  mingw32-p11-kit
 
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-gcc-c++
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-libgpg-error
+BuildRequires:  mingw64-libgcrypt
+BuildRequires:  mingw64-gettext
+BuildRequires:  mingw64-win-iconv
+BuildRequires:  mingw64-readline
+BuildRequires:  mingw64-zlib
+BuildRequires:  mingw64-p11-kit
+
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -55,6 +68,7 @@ GnuTLS TLS/SSL encryption library.  This library is cross-compiled
 for MinGW.
 
 
+# Win32
 %package -n mingw32-gnutls
 Summary:        MinGW GnuTLS TLS/SSL encryption library
 Requires:       pkgconfig
@@ -63,8 +77,17 @@ Requires:       pkgconfig
 GnuTLS TLS/SSL encryption library.  This library is cross-compiled
 for MinGW.
 
+# Win64
+%package -n mingw64-gnutls
+Summary:        MinGW GnuTLS TLS/SSL encryption library
+Requires:       pkgconfig
+
+%description -n mingw64-gnutls
+GnuTLS TLS/SSL encryption library.  This library is cross-compiled
+for MinGW.
+
 
-%{?mingw32_debug_package}
+%?mingw_debug_package
 
 
 %prep
@@ -89,42 +112,45 @@ autoreconf
 
 
 %build
-PATH="%{mingw32_bindir}:$PATH" \
-%{mingw32_configure} \
-  --with-libgcrypt \
-  --with-included-libtasn1 \
-  --disable-srp-authentication \
-  --disable-static
+%mingw_configure                   \
+    --with-included-libtasn1       \
+    --with-included-libcfg         \
+    --disable-srp-authentication   \
+    --disable-static               \
+    --disable-nls                  \
+    --with-libgcrypt
 # %{?_smp_mflags} doesn't build correctly.
-make
+%mingw_make
 cp lib/COPYING COPYING.LIB
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{mingw32_datadir}/info/dir
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove .la files
 rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.la
+
+# The .def files aren't interesting for other binaries
+rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/*.def
+rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/*.def
 
 # Remove info and man pages which duplicate stuff in Fedora already.
 rm -rf $RPM_BUILD_ROOT%{mingw32_infodir}
 rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
 
-%find_lang libgnutls
+rm -rf $RPM_BUILD_ROOT%{mingw64_infodir}
+rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
 
 
-%files -n mingw32-gnutls -f libgnutls.lang
+%files -n mingw32-gnutls
 %doc COPYING COPYING.LIB
 %{mingw32_bindir}/certtool.exe
 %{mingw32_bindir}/gnutls-cli-debug.exe
 %{mingw32_bindir}/gnutls-cli.exe
 %{mingw32_bindir}/gnutls-serv.exe
-%{mingw32_bindir}/libgnutls-26.def
 %{mingw32_bindir}/libgnutls-26.dll
-%{mingw32_bindir}/libgnutls-extra-26.def
 %{mingw32_bindir}/libgnutls-extra-26.dll
-%{mingw32_bindir}/libgnutls-openssl-26.def
 %{mingw32_bindir}/libgnutls-openssl-27.dll
 %{mingw32_bindir}/libgnutlsxx-27.dll
 %{mingw32_bindir}/p11tool.exe
@@ -137,8 +163,32 @@ rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
 %{mingw32_libdir}/pkgconfig/gnutls.pc
 %{mingw32_includedir}/gnutls/
 
+%files -n mingw64-gnutls
+%doc COPYING COPYING.LIB
+%{mingw64_bindir}/certtool.exe
+%{mingw64_bindir}/gnutls-cli-debug.exe
+%{mingw64_bindir}/gnutls-cli.exe
+%{mingw64_bindir}/gnutls-serv.exe
+%{mingw64_bindir}/libgnutls-26.dll
+%{mingw64_bindir}/libgnutls-extra-26.dll
+%{mingw64_bindir}/libgnutls-openssl-27.dll
+%{mingw64_bindir}/libgnutlsxx-27.dll
+%{mingw64_bindir}/p11tool.exe
+%{mingw64_bindir}/psktool.exe
+%{mingw64_libdir}/libgnutls-extra.dll.a
+%{mingw64_libdir}/libgnutls-openssl.dll.a
+%{mingw64_libdir}/libgnutls.dll.a
+%{mingw64_libdir}/libgnutlsxx.dll.a
+%{mingw64_libdir}/pkgconfig/gnutls-extra.pc
+%{mingw64_libdir}/pkgconfig/gnutls.pc
+%{mingw64_includedir}/gnutls/
+
 
 %changelog
+* Sun Mar 11 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.12.14-6
+- Added win64 support
+- Dropped .def files
+
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.12.14-5
 - Renamed the source package to mingw-gnutls (RHBZ #800878)
 - Use mingw macros without leading underscore