[mingw-goocanvas2] Build 64 bit Windows binaries

Kalev Lember kalev at fedoraproject.org
Fri Mar 16 12:41:26 UTC 2012


commit f2534138f09dfba568c1f1bf0d6e707c6f26c42a
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Mar 16 14:35:41 2012 +0200

    Build 64 bit Windows binaries

 mingw-goocanvas2.spec |   50 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 11 deletions(-)
---
diff --git a/mingw-goocanvas2.spec b/mingw-goocanvas2.spec
index 402c412..54361d9 100644
--- a/mingw-goocanvas2.spec
+++ b/mingw-goocanvas2.spec
@@ -1,13 +1,14 @@
-%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
 
 # first two digits of version
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           mingw-goocanvas2
 Version:        2.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows canvas library for GTK+
 
 License:        LGPLv2+
@@ -17,10 +18,14 @@ Source0:        http://download.gnome.org/sources/goocanvas/%{release_version}/g
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 68
+BuildRequires:  mingw32-filesystem >= 95
+BuildRequires:  mingw64-filesystem >= 95
 BuildRequires:  mingw32-gcc
+BuildRequires:  mingw64-gcc
 BuildRequires:  mingw32-binutils
+BuildRequires:  mingw64-binutils
 BuildRequires:  mingw32-gtk3
+BuildRequires:  mingw64-gtk3
 # Native one for msgfmt
 BuildRequires:  gettext
 # Native one for glib-genmarshal and glib-mkenums
@@ -44,7 +49,17 @@ drawing.
 This package contains the MinGW Windows cross compiled GooCanvas 2.0 library.
 
 
-%{?mingw32_debug_package}
+%package -n mingw64-goocanvas2
+Summary:        MinGW Windows canvas library for GTK+
+
+%description -n mingw64-goocanvas2
+GooCanvas is a canvas widget for GTK+ that uses the cairo 2D library for
+drawing.
+
+This package contains the MinGW Windows cross compiled GooCanvas 2.0 library.
+
+
+%?mingw_debug_package
 
 
 %prep
@@ -52,34 +67,47 @@ This package contains the MinGW Windows cross compiled GooCanvas 2.0 library.
 
 
 %build
-%{mingw32_configure} \
+export lt_cv_deplibs_check_method="pass_all"
+%mingw_configure \
   --disable-static \
   --enable-python=no
 
-make %{?_smp_mflags} V=1
+%mingw_make %{?_smp_mflags} V=1
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%mingw_make install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove .la files
 rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+rm $RPM_BUILD_ROOT%{mingw64_libdir}/*.la
 
 # Remove documentation which duplicates Fedora native
 rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 
-%find_lang goocanvas2
+%mingw_find_lang goocanvas2
 
 
-%files -n mingw32-goocanvas2 -f goocanvas2.lang
+%files -n mingw32-goocanvas2 -f mingw32-goocanvas2.lang
 %doc COPYING
 %{mingw32_bindir}/libgoocanvas-2.0-9.dll
 %{mingw32_includedir}/goocanvas-2.0/
 %{mingw32_libdir}/libgoocanvas-2.0.dll.a
 %{mingw32_libdir}/pkgconfig/goocanvas-2.0.pc
 
+%files -n mingw64-goocanvas2 -f mingw64-goocanvas2.lang
+%doc COPYING
+%{mingw64_bindir}/libgoocanvas-2.0-9.dll
+%{mingw64_includedir}/goocanvas-2.0/
+%{mingw64_libdir}/libgoocanvas-2.0.dll.a
+%{mingw64_libdir}/pkgconfig/goocanvas-2.0.pc
+
 
 %changelog
+* Fri Mar 16 2012 Kalev Lember <kalevlember at gmail.com> - 2.0.1-4
+- Build 64 bit Windows binaries
+
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.1-3
 - Rebuild against the mingw-w64 toolchain
 


More information about the scm-commits mailing list