[mingw-atk] Added win64 support
epienbro
epienbro at fedoraproject.org
Sun Mar 11 16:52:27 UTC 2012
commit d77261bd45a427a908beba3a06eb3cee75c8a363
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Mar 11 17:52:23 2012 +0100
Added win64 support
mingw-atk.spec | 80 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 65 insertions(+), 15 deletions(-)
---
diff --git a/mingw-atk.spec b/mingw-atk.spec
index c6e04a0..6774b0e 100644
--- a/mingw-atk.spec
+++ b/mingw-atk.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-atk
Version: 2.3.93
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows Atk library
License: LGPLv2+
@@ -16,13 +17,22 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/atk/%{release_version}/at
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-win-iconv
BuildRequires: mingw32-gettext
BuildRequires: mingw32-glib2
+
+BuildRequires: mingw64-filesystem >= 95
+BuildRequires: mingw64-gcc
+BuildRequires: mingw64-binutils
+BuildRequires: mingw64-win-iconv
+BuildRequires: mingw64-gettext
+BuildRequires: mingw64-glib2
+
BuildRequires: pkgconfig
+BuildRequires: autoconf automake libtool
# Need native one too for msgfmt
BuildRequires: gettext
# Need native one too for glib-genmarshal
@@ -33,6 +43,7 @@ BuildRequires: glib2-devel
MinGW Windows Atk library.
+# Win32
%package -n mingw32-atk
Summary: MinGW Windows Atk library
Requires: pkgconfig
@@ -48,39 +59,64 @@ Group: Development/Libraries
%description -n mingw32-atk-static
Static version of the MinGW Windows Atk library.
+# Win64
+%package -n mingw64-atk
+Summary: MinGW Windows Atk library
+Requires: pkgconfig
+
+%description -n mingw64-atk
+MinGW Windows Atk library.
-%{?_mingw32_debug_package}
+%package -n mingw64-atk-static
+Summary: Static version of the MinGW Windows Atk library
+Requires: mingw64-atk = %{version}-%{release}
+Group: Development/Libraries
+
+%description -n mingw64-atk-static
+Static version of the MinGW Windows Atk library.
+
+
+%?mingw_debug_package
%prep
%setup -q -n atk-%{version}
+# The libtool bundled with this package is too old for win64 support
+autoreconf -i --force
+
%build
-%{mingw32_configure} --enable-static --enable-shared
-make %{?_smp_mflags}
+%mingw_configure --enable-static --enable-shared
+%mingw_make %{?_smp_mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT
+
+%mingw_make_install "DESTDIR=$RPM_BUILD_ROOT"
# Native Fedora package removes this file, so we do the same.
-rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/charset.alias
# Documentation duplicates what is in the native Fedora package.
-rm -rf $RPM_BUILD_ROOT/%{mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
# Remove this file, only used while creating the DLL.
# See: https://bugzilla.redhat.com/show_bug.cgi?id=467409#c8
-rm $RPM_BUILD_ROOT%{mingw32_libdir}/atk-1.0.def
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/atk-1.0.def
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/atk-1.0.def
# Drop all .la files
find $RPM_BUILD_ROOT -name "*.la" -delete
-%find_lang atk10
+%mingw_find_lang atk10
-%files -n mingw32-atk -f atk10.lang
+# Win32
+%files -n mingw32-atk -f mingw32-atk10.lang
%doc COPYING
%{mingw32_bindir}/libatk-1.0-0.dll
%{mingw32_includedir}/atk-1.0
@@ -90,9 +126,23 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%files -n mingw32-atk-static
%{mingw32_libdir}/libatk-1.0.a
+# Win64
+%files -n mingw64-atk -f mingw64-atk10.lang
+%doc COPYING
+%{mingw64_bindir}/libatk-1.0-0.dll
+%{mingw64_includedir}/atk-1.0
+%{mingw64_libdir}/libatk-1.0.dll.a
+%{mingw64_libdir}/pkgconfig/atk.pc
+
+%files -n mingw64-atk-static
+%{mingw64_libdir}/libatk-1.0.a
+
%changelog
-* Thu Mar 8 2012 Erik van Pienbroek <epienbro at fedoraproject.org> 2.3.93-1
+* Sun Mar 11 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.3.93-2
+- Added win64 support
+
+* Thu Mar 8 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.3.93-1
- Update to 2.3.93
- Dropped .la files
More information about the scm-commits
mailing list