[mingw-pango] Added win64 support

Sun Mar 11 16:59:42 UTC 2012

commit 24ae69264529415134a4cf1a718773f131778492
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Mar 11 17:59:37 2012 +0100

    Added win64 support

 mingw-pango.spec |  135 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 115 insertions(+), 20 deletions(-)
---

diff --git a/mingw-pango.spec b/mingw-pango.spec
index 88aa612..febf98a 100644
--- a/mingw-pango.spec
+++ b/mingw-pango.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-pango
 Version:        1.29.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows Pango library
 
 License:        LGPLv2+
@@ -26,13 +27,11 @@ Patch1000:      pango_enable_static_build.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
-
-BuildRequires:  mingw32-cairo >= 1.8.0
-BuildRequires:  mingw32-dlfcn
+BuildRequires:  mingw32-cairo
 BuildRequires:  mingw32-expat
 BuildRequires:  mingw32-fontconfig
 BuildRequires:  mingw32-freetype
@@ -41,6 +40,21 @@ BuildRequires:  mingw32-glib2
 BuildRequires:  mingw32-win-iconv
 BuildRequires:  mingw32-libpng
 BuildRequires:  mingw32-pixman
+
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-gcc-c++
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-cairo
+BuildRequires:  mingw64-expat
+BuildRequires:  mingw64-fontconfig
+BuildRequires:  mingw64-freetype
+BuildRequires:  mingw64-gettext
+BuildRequires:  mingw64-glib2
+BuildRequires:  mingw64-win-iconv
+BuildRequires:  mingw64-libpng
+BuildRequires:  mingw64-pixman
+
 BuildRequires:  pkgconfig
 
 
@@ -48,6 +62,7 @@ BuildRequires:  pkgconfig
 MinGW Windows Pango library.
 
 
+# Win32
 %package -n mingw32-pango
 Summary:        MinGW Windows Pango library
 Requires:       pkgconfig
@@ -55,7 +70,6 @@ Requires:       pkgconfig
 %description -n mingw32-pango
 MinGW Windows Pango library.
 
-
 %package -n mingw32-pango-static
 Summary:        Static version of the MinGW Windows Pango library
 Requires:       mingw32-pango = %{version}-%{release}
@@ -64,8 +78,24 @@ Group:          Development/Libraries
 %description -n mingw32-pango-static
 Static version of the MinGW Windows Pango library.
 
+# Win64
+%package -n mingw64-pango
+Summary:        MinGW Windows Pango library
+Requires:       pkgconfig
 
-%{?mingw32_debug_package}
+%description -n mingw64-pango
+MinGW Windows Pango library.
+
+%package -n mingw64-pango-static
+Summary:        Static version of the MinGW Windows Pango library
+Requires:       mingw64-pango = %{version}-%{release}
+Group:          Development/Libraries
+
+%description -n mingw64-pango-static
+Static version of the MinGW Windows Pango library.
+
+
+%?mingw_debug_package
 
 
 %prep
@@ -74,23 +104,31 @@ Static version of the MinGW Windows Pango library.
 
 
 %build
-# Need to run the correct version of glib-mkenums.
-PATH=%{mingw32_bindir}:$PATH \
-%{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
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{mingw32_sysconfdir}/pango/
-cp %{SOURCE1} $RPM_BUILD_ROOT%{mingw32_sysconfdir}/pango/
+mkdir -p $RPM_BUILD_ROOT%{mingw64_sysconfdir}/pango/
+cp %{SOURCE1} $RPM_BUILD_ROOT%{mingw32_sysconfdir}/pango/pango.modules
+cp %{SOURCE1} $RPM_BUILD_ROOT%{mingw64_sysconfdir}/pango/pango.modules
+
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/charset.alias
 
-rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/charset.alias
-rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/*.def
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}/man1
+rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}/man1
 
-rm -rf $RPM_BUILD_ROOT/%{mingw32_mandir}/man1
+# Drop the gtk-doc documentation
 rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
+
+# Drop the .def files as they aren't needed by other binaries
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.def
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.def
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
@@ -98,8 +136,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 # Drop the .dll.a files for all modules as nothing is supposed
 # to link directly to these modules
 rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/pango/1.6.0/modules/*.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/pango/1.6.0/modules/*.dll.a
 
 
+# Win32
 %files -n mingw32-pango
 %doc COPYING
 %{mingw32_bindir}/libpango-1.0-0.dll
@@ -134,7 +174,6 @@ rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/pango/1.6.0/modules/*.dll.a
 %{mingw32_libdir}/pkgconfig/pangowin32.pc
 %{mingw32_sysconfdir}/pango/
 
-
 %files -n mingw32-pango-static
 %{mingw32_libdir}/libpango-1.0.a
 %{mingw32_libdir}/libpangocairo-1.0.a
@@ -152,9 +191,65 @@ rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/pango/1.6.0/modules/*.dll.a
 %{mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.a
 %{mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.a
 %{mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.a
+
+# Win64
+%files -n mingw64-pango
+%doc COPYING
+%{mingw64_bindir}/libpango-1.0-0.dll
+%{mingw64_bindir}/libpangocairo-1.0-0.dll
+%{mingw64_bindir}/libpangoft2-1.0-0.dll
+%{mingw64_bindir}/libpangowin32-1.0-0.dll
+%{mingw64_bindir}/pango-querymodules.exe
+%{mingw64_bindir}/pango-view.exe
+%{mingw64_includedir}/pango-1.0/
+%{mingw64_libdir}/libpango-1.0.dll.a
+%{mingw64_libdir}/libpangocairo-1.0.dll.a
+%{mingw64_libdir}/libpangoft2-1.0.dll.a
+%{mingw64_libdir}/libpangowin32-1.0.dll.a
+%dir %{mingw64_libdir}/pango
+%dir %{mingw64_libdir}/pango/1.6.0
+%dir %{mingw64_libdir}/pango/1.6.0/modules
+%{mingw64_libdir}/pango/1.6.0/modules/pango-basic-win32.dll
+%{mingw64_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll
+%{mingw64_libdir}/pango/1.6.0/modules/pango-indic-lang.dll
+%{mingw64_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll
+%{mingw64_libdir}/pango/1.6.0/modules/pango-basic-fc.dll
+%{mingw64_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll
+%{mingw64_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll
+%{mingw64_libdir}/pango/1.6.0/modules/pango-indic-fc.dll
+%{mingw64_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll
+%{mingw64_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll
+%{mingw64_libdir}/pango/1.6.0/modules/pango-thai-fc.dll
+%{mingw64_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll
+%{mingw64_libdir}/pkgconfig/pango.pc
+%{mingw64_libdir}/pkgconfig/pangocairo.pc
+%{mingw64_libdir}/pkgconfig/pangoft2.pc
+%{mingw64_libdir}/pkgconfig/pangowin32.pc
+%{mingw64_sysconfdir}/pango/
+
+%files -n mingw64-pango-static
+%{mingw64_libdir}/libpango-1.0.a
+%{mingw64_libdir}/libpangocairo-1.0.a
+%{mingw64_libdir}/libpangoft2-1.0.a
+%{mingw64_libdir}/libpangowin32-1.0.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-basic-win32.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-arabic-lang.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-indic-lang.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-arabic-fc.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-basic-fc.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-hangul-fc.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-hebrew-fc.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-indic-fc.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-khmer-fc.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-syriac-fc.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-thai-fc.a
+%{mingw64_libdir}/pango/1.6.0/modules/pango-tibetan-fc.a
   
 
 %changelog
+* Sun Mar 11 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.29.5-4
+- Added win64 support
+
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 1.29.5-3
 - Renamed the source package to mingw-pango (#800444)
 - Use mingw macros without leading underscore
