Added win64 support

mingw-libpng.spec

@@ -1,10 +1,11 @@
-%global __strip %{mingw32_strip}
+%?mingw_package_header
-%global __objdump %{mingw32_objdump}
+
-%define __debug_install_post %{mingw32_debug_install_post}
+%global mingw_build_win32 1
+%global mingw_build_win64 1
 
 Name:           mingw-libpng
 Version:        1.5.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows Libpng library
 
 License:        zlib
@@ -15,15 +16,22 @@ Group:          Development/Libraries
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 68
+BuildRequires:  mingw32-filesystem >= 95
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-zlib
+
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-zlib
 
+
 %description
 MinGW Windows Libpng library.
 
 
+# Win32
 %package -n mingw32-libpng
 Summary:        MinGW Windows Libpng library
 Requires:       pkgconfig
@@ -31,7 +39,6 @@ Requires:       pkgconfig
 %description -n mingw32-libpng
 MinGW Windows Libpng library.
 
-
 %package -n mingw32-libpng-static
 Summary:        Static version of MinGW Windows Libpng library
 Requires:       mingw32-libpng = %{version}-%{release}
@@ -42,7 +49,26 @@ MinGW Windows Libpng library.
 
 This package contains static cross-compiled libraries.
 
-%{?mingw32_debug_package}
+# Win64
+%package -n mingw64-libpng
+Summary:        MinGW Windows Libpng library
+Requires:       pkgconfig
+
+%description -n mingw64-libpng
+MinGW Windows Libpng library.
+
+%package -n mingw64-libpng-static
+Summary:        Static version of MinGW Windows Libpng library
+Requires:       mingw64-libpng = %{version}-%{release}
+Group:          Development/Libraries
+
+%description -n mingw64-libpng-static
+MinGW Windows Libpng library.
+
+This package contains static cross-compiled libraries.
+
+
+%?mingw_debug_package
 
 
 %prep
@@ -50,12 +76,12 @@ This package contains static cross-compiled libraries.
 
 
 %build
-%{mingw32_configure}
+%mingw_configure
-make %{?_smp_mflags}
+%mingw_make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
@@ -63,8 +89,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 # No need to distribute manpages which appear in the Fedora
 # native packages already.
 rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
 
 
+# Win32
 %files -n mingw32-libpng
 %doc ANNOUNCE CHANGES LICENSE README TODO
 %{mingw32_bindir}/libpng-config
@@ -83,7 +111,30 @@ rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
 %{mingw32_libdir}/libpng.a
 %{mingw32_libdir}/libpng15.a
 
+# Win64
+%files -n mingw64-libpng
+%doc ANNOUNCE CHANGES LICENSE README TODO
+%{mingw64_bindir}/libpng-config
+%{mingw64_bindir}/libpng15-15.dll
+%{mingw64_bindir}/libpng15-config
+%{mingw64_includedir}/libpng15
+%{mingw64_includedir}/png.h
+%{mingw64_includedir}/pngconf.h
+%{mingw64_includedir}/pnglibconf.h
+%{mingw64_libdir}/libpng.dll.a
+%{mingw64_libdir}/libpng15.dll.a
+%{mingw64_libdir}/pkgconfig/libpng.pc
+%{mingw64_libdir}/pkgconfig/libpng15.pc
+
+%files -n mingw64-libpng-static
+%{mingw64_libdir}/libpng.a
+%{mingw64_libdir}/libpng15.a
+
+
 %changelog
+* Sat Mar 10 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.5.7-4
+- Added win64 support
+
 * Tue Mar 06 2012 Kalev Lember <kalevlember@gmail.com> - 1.5.7-3
 - Renamed the source package to mingw-libpng (#800430)
 - Use mingw macros without leading underscore