From 3480dde11c2b1e5cd268b66914166bbdf63a6788 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Mar 14 2012 10:34:14 +0000
Subject: Build 64 bit Windows binaries


---

diff --git a/mingw-jasper.spec b/mingw-jasper.spec
index 9784c15..f2eef6e 100644
--- a/mingw-jasper.spec
+++ b/mingw-jasper.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-jasper
 Version:        1.900.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        MinGW Windows Jasper library
 
 License:        JasPer
@@ -28,12 +29,14 @@ Patch1001:      jasper-1.900.1-sleep.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-filesystem >= 95
+BuildRequires:  mingw64-filesystem >= 95
 BuildRequires:  mingw32-gcc
+BuildRequires:  mingw64-gcc
 BuildRequires:  mingw32-binutils
+BuildRequires:  mingw64-binutils
 BuildRequires:  mingw32-libjpeg
-BuildRequires:  mingw32-dlfcn
-
+BuildRequires:  mingw64-libjpeg
 
 %description
 MinGW Windows Jasper library.
@@ -55,7 +58,23 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Jasper library.
 
 
-%{?mingw32_debug_package}
+%package -n mingw64-jasper
+Summary:        MinGW Windows Jasper library
+
+%description -n mingw64-jasper
+MinGW Windows Jasper library.
+
+
+%package -n mingw64-jasper-static
+Summary:        Static version of the MinGW Windows Jasper library
+Requires:       mingw64-jasper = %{version}-%{release}
+Group:          Development/Libraries
+
+%description -n mingw64-jasper-static
+Static version of the MinGW Windows Jasper library.
+
+
+%?mingw_debug_package
 
 
 %prep
@@ -67,16 +86,18 @@ Static version of the MinGW Windows Jasper library.
 
 
 %build
-%{mingw32_configure} \
+export lt_cv_deplibs_check_method="pass_all"
+%mingw_configure \
   --disable-opengl --enable-libjpeg --enable-static --enable-shared
-make %{?_smp_mflags}
+%mingw_make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install mandir=%{mingw32_mandir}
+%mingw_make DESTDIR=$RPM_BUILD_ROOT install mandir=%{mingw32_mandir}
 
 # Remove .la files
 rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+rm $RPM_BUILD_ROOT%{mingw64_libdir}/*.la
 
 # Remove the manual pages - don't duplicate documentation which
 # is in the native Fedora package.
@@ -96,8 +117,24 @@ rm $RPM_BUILD_ROOT%{mingw32_mandir}/man1/*
 %files -n mingw32-jasper-static
 %{mingw32_libdir}/libjasper.a
 
+%files -n mingw64-jasper
+%doc COPYRIGHT LICENSE NEWS README
+%{mingw64_bindir}/%{mingw64_target}-imgcmp.exe
+%{mingw64_bindir}/%{mingw64_target}-imginfo.exe
+%{mingw64_bindir}/%{mingw64_target}-jasper.exe
+%{mingw64_bindir}/%{mingw64_target}-tmrdemo.exe
+%{mingw64_bindir}/libjasper-1.dll
+%{mingw64_libdir}/libjasper.dll.a
+%{mingw64_includedir}/jasper/
+
+%files -n mingw64-jasper-static
+%{mingw64_libdir}/libjasper.a
+
 
 %changelog
+* Wed Mar 14 2012 Kalev Lember <kalevlember@gmail.com> - 1.900.1-18
+- Build 64 bit Windows binaries
+
 * Fri Mar 09 2012 Kalev Lember <kalevlember@gmail.com> - 1.900.1-17
 - Remove .la files