[mingw-libidn] Added win64 support (contributed by Mikkel Kruse Johnsen)

[epienbro]

commit bc5f42ee475a362a14cfaa452157de167aabce19
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Mar 18 20:14:37 2012 +0100

    Added win64 support (contributed by Mikkel Kruse Johnsen)

 mingw-libidn.spec |   74 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 61 insertions(+), 13 deletions(-)
---
diff --git a/mingw-libidn.spec b/mingw-libidn.spec
index 1437aea..aa07292 100644
--- a/mingw-libidn.spec
+++ b/mingw-libidn.spec
@@ -1,6 +1,4 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%?mingw_package_header
 
 # Native Fedora package is ancient, 0.6.14, which doesn't even
 # exist on the upstream servers any more.  I have gone for the
@@ -8,7 +6,7 @@
 
 Name:           mingw-libidn
 Version:        1.14
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        MinGW Windows Internationalized Domain Name support library
 
 License:        LGPLv2+
@@ -18,12 +16,20 @@ Source0:        http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-gettext
 BuildRequires:  mingw32-win-iconv
-BuildRequires:  pkgconfig, gettext
+
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-gettext
+BuildRequires:  mingw64-win-iconv
+
+BuildRequires:  pkgconfig gettext
+BuildRequires:  autoconf automake libtool
 
 
 %description
@@ -33,6 +39,7 @@ Names (IDN) working group, used for internationalized domain
 names.
 
 
+# Win32
 %package -n mingw32-libidn
 Summary:        MinGW Windows zlib compression library for the win32 target
 Requires:       pkgconfig
@@ -51,38 +58,65 @@ Group:          Development/Libraries
 %description -n mingw32-libidn-static
 Static version of the MinGW Windows IDN library.
 
+# Win64
+%package -n mingw64-libidn
+Summary:        MinGW Windows zlib compression library for the win64 target
+Requires:       pkgconfig
+
+%description -n mingw64-libidn
+GNU Libidn is an implementation of the Stringprep, Punycode and
+IDNA specifications defined by the IETF Internationalized Domain
+Names (IDN) working group, used for internationalized domain
+names.
+
+%package -n mingw64-libidn-static
+Summary:        Static version of the MinGW Windows IDN library
+Requires:       mingw64-libidn = %{version}-%{release}
+Group:          Development/Libraries
+
+%description -n mingw64-libidn-static
+Static version of the MinGW Windows IDN library.
+
 
-%{mingw32_debug_package}
+%?mingw_debug_package
 
 
 %prep
 %setup -q -n libidn-%{version}
 
+# The libtool bundled with this package is too old for win64 support
+autoreconf -i --force
+
 
 %build
-%{mingw32_configure} --disable-csharp --enable-static --enable-shared
+%mingw_configure --disable-csharp --enable-static --enable-shared
 # The compilation fails when using -j2, so leave the %{?_smp_mflags} behind for now
-make 
+%mingw_make
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove documentation which duplicates native Fedora package.
 rm -r $RPM_BUILD_ROOT%{mingw32_datadir}/emacs
+rm -r $RPM_BUILD_ROOT%{mingw64_datadir}/emacs
 rm -r $RPM_BUILD_ROOT%{mingw32_infodir}
+rm -r $RPM_BUILD_ROOT%{mingw64_infodir}
 rm -r $RPM_BUILD_ROOT%{mingw32_mandir}/man*
+rm -r $RPM_BUILD_ROOT%{mingw64_mandir}/man*
 
 # The .def file isn't interesting for other libraries/applications
 rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/libidn-11.def
+rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/libidn-11.def
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
-%find_lang libidn
+%mingw_find_lang libidn
 
 
-%files -n mingw32-libidn -f libidn.lang
+# Win32
+%files -n mingw32-libidn -f mingw32-libidn.lang
 %doc COPYING COPYING.LIB
 %{mingw32_bindir}/idn.exe
 %{mingw32_bindir}/libidn-11.dll
@@ -90,12 +124,26 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw32_libdir}/pkgconfig/libidn.pc
 %{mingw32_includedir}/*.h
 
-
 %files -n mingw32-libidn-static
 %{mingw32_libdir}/libidn.a
 
+# Win64
+%files -n mingw64-libidn -f mingw64-libidn.lang
+%doc COPYING COPYING.LIB
+%{mingw64_bindir}/idn.exe
+%{mingw64_bindir}/libidn-11.dll
+%{mingw64_libdir}/libidn.dll.a
+%{mingw64_libdir}/pkgconfig/libidn.pc
+%{mingw64_includedir}/*.h
+
+%files -n mingw64-libidn-static
+%{mingw64_libdir}/libidn.a
+
 
 %changelog
+* Sun Mar 18 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.14-13
+- Added win64 support (contributed by Mikkel Kruse Johnsen)
+
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.14-12
 - Renamed the source package to mingw-libidn (RHBZ #800914)
 - Use mingw macros without leading underscore