[mingw-fontconfig] Added win64 support

[epienbro]

commit 67fcca8e03a1119f35fe38e55699e8f3b8ccfb9b
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Mar 11 17:34:30 2012 +0100

    Added win64 support
    
    - Added win64 support
    - Added static subpackage
    - Dropped .def files

 mingw-fontconfig.spec |  110 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 90 insertions(+), 20 deletions(-)
---
diff --git a/mingw-fontconfig.spec b/mingw-fontconfig.spec
index e911fd2..58880b7 100644
--- a/mingw-fontconfig.spec
+++ b/mingw-fontconfig.spec
@@ -1,10 +1,11 @@
-%define __strip %{mingw32_strip}
-%define __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-fontconfig
 Version:        2.8.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW Windows Fontconfig library
 
 License:        MIT
@@ -14,7 +15,7 @@ Group:          Development/Libraries
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 68
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-dlfcn
@@ -22,53 +23,96 @@ BuildRequires:  mingw32-expat
 BuildRequires:  mingw32-freetype
 BuildRequires:  mingw32-win-iconv
 BuildRequires:  mingw32-libxml2
-BuildRequires:  pkgconfig
 
-Requires:       pkgconfig
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-dlfcn
+BuildRequires:  mingw64-expat
+BuildRequires:  mingw64-freetype
+BuildRequires:  mingw64-win-iconv
+BuildRequires:  mingw64-libxml2
+
+BuildRequires:  pkgconfig
+BuildRequires:  autoconf automake libtool
 
 
 %description
 MinGW Windows Fontconfig library.
 
 
+# Win32
 %package -n mingw32-fontconfig
-Summary:         MinGW Windows Fontconfig library
+Summary:        MinGW Windows Fontconfig library
+Requires:       pkgconfig
 
 %description -n mingw32-fontconfig
 MinGW Windows Fontconfig library.
 
+%package -n mingw32-fontconfig-static
+Summary:       Static version of the cross compiled Fontconfig library
+Requires:      mingw32-fontconfig = %{version}-%{release}
+
+%description -n mingw32-fontconfig-static
+Static version of the cross compiled Fontconfig library.
+
+# Win64
+%package -n mingw64-fontconfig
+Summary:        MinGW Windows Fontconfig library
+Requires:       pkgconfig
 
-%{?mingw32_debug_package}
+%description -n mingw64-fontconfig
+MinGW Windows Fontconfig library.
+
+%package -n mingw64-fontconfig-static
+Summary:       Static version of the cross compiled Fontconfig library
+Requires:      mingw64-fontconfig = %{version}-%{release}
+
+%description -n mingw64-fontconfig-static
+Static version of the cross compiled Fontconfig library.
+
+
+%?mingw_debug_package
 
 
 %prep
 %setup -q -n fontconfig-%{version}
 
+# The libtool used in this package is too old for win64 support
+autoreconf -i --force
+
 
 %build
-PATH="%{mingw32_bindir}:$PATH" \
-%{mingw32_configure} \
-    --with-arch=i686 \
-    --disable-docs
-make %{?_smp_mflags}
+export MINGW32_CONFIGURE_ARGS="--with-arch=i686"
+export MINGW64_CONFIGURE_ARGS="--with-arch=x86_64"
+%mingw_configure
+%mingw_make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT/%{mingw64_libdir}/charset.alias
 
-# Remove static library.
-rm $RPM_BUILD_ROOT%{mingw32_libdir}/libfontconfig.a
+# Remove the .def file
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/fontconfig.def
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/fontconfig.def
 
 # Remove .la files
 rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.la
 
-# Remove duplicate documentation.
+# Remove duplicate manpages.
 rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
-rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/fontconfig
+rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
+
+# Remove the docs
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc
 
 
+# Win32
 %files -n mingw32-fontconfig
 %doc COPYING
 %{mingw32_bindir}/fc-cache.exe
@@ -78,13 +122,39 @@ rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/fontconfig
 %{mingw32_bindir}/fc-query.exe
 %{mingw32_bindir}/fc-scan.exe
 %{mingw32_bindir}/libfontconfig-1.dll
-%{mingw32_libdir}/fontconfig.def
 %{mingw32_libdir}/libfontconfig.dll.a
 %{mingw32_libdir}/pkgconfig/fontconfig.pc
 %{mingw32_includedir}/fontconfig/
 %{mingw32_sysconfdir}/fonts/
 
+%files -n mingw32-fontconfig-static
+%{mingw32_libdir}/libfontconfig.a
+
+# Win64
+%files -n mingw64-fontconfig
+%doc COPYING
+%{mingw64_bindir}/fc-cache.exe
+%{mingw64_bindir}/fc-cat.exe
+%{mingw64_bindir}/fc-list.exe
+%{mingw64_bindir}/fc-match.exe
+%{mingw64_bindir}/fc-query.exe
+%{mingw64_bindir}/fc-scan.exe
+%{mingw64_bindir}/libfontconfig-1.dll
+%{mingw64_libdir}/libfontconfig.dll.a
+%{mingw64_libdir}/pkgconfig/fontconfig.pc
+%{mingw64_includedir}/fontconfig/
+%{mingw64_sysconfdir}/fonts/
+
+%files -n mingw64-fontconfig-static
+%{mingw64_libdir}/libfontconfig.a
+
+
 %changelog
+* Sun Mar 11 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.8.0-7
+- Added win64 support
+- Added static subpackage
+- Dropped .def files
+
 * Fri Mar 09 2012 Kalev Lember <kalevlember at gmail.com> - 2.8.0-6
 - Remove .la files