[mingw-gtkmm24] Added win64 support (contributed by Tim Mayberry)

[Erik van Pienbroek]

commit 1db043e0f876157b52f503b891f4e988c8acb55a
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Apr 14 19:58:55 2012 +0200

    Added win64 support (contributed by Tim Mayberry)

 mingw-gtkmm24.spec |   70 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 60 insertions(+), 10 deletions(-)
---
diff --git a/mingw-gtkmm24.spec b/mingw-gtkmm24.spec
index f2773e5..70da81d 100644
--- a/mingw-gtkmm24.spec
+++ b/mingw-gtkmm24.spec
@@ -1,10 +1,8 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%?mingw_package_header
 
 Name:           mingw-gtkmm24
 Version:        2.24.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
@@ -14,7 +12,7 @@ Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.24/gtkmm-%{versio
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 68
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
@@ -27,6 +25,19 @@ BuildRequires:  mingw32-cairomm
 BuildRequires:  mingw32-pangomm
 BuildRequires:  mingw32-atkmm
 
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-gcc-c++
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-gettext
+BuildRequires:  mingw64-glibmm24
+BuildRequires:  mingw64-atk
+BuildRequires:  mingw64-pango
+BuildRequires:  mingw64-gtk2 >= 2.19.6
+BuildRequires:  mingw64-cairomm
+BuildRequires:  mingw64-pangomm
+BuildRequires:  mingw64-atkmm
+
 
 %description
 gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps
@@ -35,31 +46,52 @@ inheritance and a comprehensive set of widget classes that can be
 freely combined to quickly create complex user interfaces.
 
 
+# Win32
 %package -n mingw32-gtkmm24
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 Requires:       pkgconfig
 
+# Fix upgrade path for people updating from the mingw-w64 testing repository
+Obsoletes:      mingw32-gtkmm24-static < 2.24.2-5
+
 %description -n mingw32-gtkmm24
 gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps
 GTK+ 2.  Highlights include typesafe callbacks, widgets extensible via
 inheritance and a comprehensive set of widget classes that can be
 freely combined to quickly create complex user interfaces.
 
+# Win64
+%package -n mingw64-gtkmm24
+Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
+Requires:       pkgconfig
+
+# Fix upgrade path for people updating from the mingw-w64 testing repository
+Obsoletes:      mingw64-gtkmm24-static < 2.24.2-5
+
+%description -n mingw64-gtkmm24
+gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps
+GTK+ 2.  Highlights include typesafe callbacks, widgets extensible via
+inheritance and a comprehensive set of widget classes that can be
+freely combined to quickly create complex user interfaces.
+
 
-%{?mingw32_debug_package}
+%?mingw_debug_package
 
 
 %prep
 %setup -q -n gtkmm-%{version}
 
+
 %build
-%{mingw32_configure} --disable-static --enable-shared --disable-demos --disable-documentation
-make %{?_smp_mflags}
+%mingw_configure --disable-static --enable-shared --disable-demos --disable-documentation
+%mingw_make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make DESTDIR=$RPM_BUILD_ROOT install
+
 rm -rf $RPM_BUILD_ROOT/%{mingw32_datadir}/gtkmm-2.4/demo/
+rm -rf $RPM_BUILD_ROOT/%{mingw64_datadir}/gtkmm-2.4/demo/
 
 # hack: some headers are not available on win32
 sed -i -e "s,#include <gtkmm/pagesetupunixdialog.h>,," $RPM_BUILD_ROOT/%{mingw32_includedir}/gtkmm-2.4/gtkmm.h
@@ -68,9 +100,10 @@ sed -i -e "s,#include <gtkmm/printjob.h>,," $RPM_BUILD_ROOT/%{mingw32_includedir
 sed -i -e "s,#include <gtkmm/printunixdialog.h>,," $RPM_BUILD_ROOT/%{mingw32_includedir}/gtkmm-2.4/gtkmm.h
 
 # Remove .la files
-rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
+# Win32
 %files -n mingw32-gtkmm24
 %doc COPYING
 %{mingw32_bindir}/libgdkmm-2.4-1.dll
@@ -84,8 +117,25 @@ rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 %{mingw32_libdir}/pkgconfig/gdkmm-2.4.pc
 %{mingw32_libdir}/pkgconfig/gtkmm-2.4.pc
 
+# Win64
+%files -n mingw64-gtkmm24
+%doc COPYING
+%{mingw64_bindir}/libgdkmm-2.4-1.dll
+%{mingw64_bindir}/libgtkmm-2.4-1.dll
+%{mingw64_libdir}/libgdkmm-2.4.dll.a
+%{mingw64_libdir}/libgtkmm-2.4.dll.a
+%{mingw64_includedir}/gdkmm-2.4
+%{mingw64_includedir}/gtkmm-2.4
+%{mingw64_libdir}/gdkmm-2.4
+%{mingw64_libdir}/gtkmm-2.4
+%{mingw64_libdir}/pkgconfig/gdkmm-2.4.pc
+%{mingw64_libdir}/pkgconfig/gtkmm-2.4.pc
+
 
 %changelog
+* Sat Apr 14 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.24.2-6
+- Added win64 support (contributed by Tim Mayberry)
+
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.24.2-5
 - Renamed the source package to mingw-gtkmm24 (RHBZ #800880)
 - Use mingw macros without leading underscore