Added win64 support

mingw-libtiff.spec

@@ -1,24 +1,33 @@
-%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
 
 Summary:        MinGW Windows port of the LibTIFF library
 Name:           mingw-libtiff
 Version:        3.9.5
-Release: 6%{?dist}
+Release:        7%{?dist}
 License:        libtiff
 Group:          System Environment/Libraries
 URL:            http://www.remotesensing.org/libtiff/
-
 Source:         ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-zlib mingw32-libjpeg
-BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw32-zlib
+BuildRequires:  mingw32-libjpeg-turbo
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
+
+BuildRequires:  mingw64-zlib
+BuildRequires:  mingw64-libjpeg-turbo
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-gcc-c++
+BuildRequires:  mingw64-binutils
+
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -34,6 +43,7 @@ The libtiff package should be installed if you need to manipulate TIFF
 format image files.
 
 
+# Win32
 %package -n mingw32-libtiff
 Summary:        MinGW Windows port of the LibTIFF library
 
@@ -46,7 +56,6 @@ used file format for bitmapped images.  TIFF files usually end in the
 The libtiff package should be installed if you need to manipulate TIFF
 format image files.
 
-
 %package -n mingw32-libtiff-static
 Summary:        Static version of the MinGW Windows LibTIFF library
 Requires:       mingw32-libtiff = %{version}-%{release}
@@ -55,8 +64,29 @@ Group:          Development/Libraries
 %description -n mingw32-libtiff-static
 Static version of the MinGW Windows LibTIFF library.
 
+# Win64
+%package -n mingw64-libtiff
+Summary:        MinGW Windows port of the LibTIFF library
+
+%description -n mingw64-libtiff
+The libtiff package contains a library of functions for manipulating
+TIFF (Tagged Image File Format) image format files.  TIFF is a widely
+used file format for bitmapped images.  TIFF files usually end in the
+.tif extension and they are often quite large.
+
+The libtiff package should be installed if you need to manipulate TIFF
+format image files.
+
+%package -n mingw64-libtiff-static
+Summary:        Static version of the MinGW Windows LibTIFF library
+Requires:       mingw64-libtiff = %{version}-%{release}
+Group:          Development/Libraries
+
+%description -n mingw64-libtiff-static
+Static version of the MinGW Windows LibTIFF library.
+
 
-%{?mingw32_debug_package}
+%?mingw_debug_package
 
 
 %prep
@@ -74,24 +104,29 @@ autoheader
 
 %build
 export MINGW32_CFLAGS="%{mingw32_cflags} -fno-strict-aliasing"
-%{mingw32_configure} --enable-static --enable-shared
-make %{?_smp_mflags}
+export MINGW64_CFLAGS="%{mingw64_cflags} -fno-strict-aliasing"
+%mingw_configure --enable-static --enable-shared
+%mingw_make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install 
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
 
 # remove docs
 rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc
 rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc
+rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
 
 # remove binaries
 rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/*.exe
+rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/*.exe
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
+# Win32
 %files -n mingw32-libtiff
 %doc COPYRIGHT README RELEASE-DATE VERSION TODO ChangeLog
 %{mingw32_bindir}/libtiff-3.dll
@@ -104,8 +139,24 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw32_libdir}/libtiff.a
 %{mingw32_libdir}/libtiffxx.a
 
+# Win64
+%files -n mingw64-libtiff
+%doc COPYRIGHT README RELEASE-DATE VERSION TODO ChangeLog
+%{mingw64_bindir}/libtiff-3.dll
+%{mingw64_bindir}/libtiffxx-3.dll
+%{mingw64_includedir}/*
+%{mingw64_libdir}/libtiff.dll.a
+%{mingw64_libdir}/libtiffxx.dll.a
+
+%files -n mingw64-libtiff-static
+%{mingw64_libdir}/libtiff.a
+%{mingw64_libdir}/libtiffxx.a
+
 
 %changelog
+* Sat Mar 10 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 3.9.5-7
+- Added win64 support
+
 * Fri Mar 09 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 3.9.5-6
 - Dropped .la files