X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=pango%2Fmingw-pango.spec;h=973a7f83e78ae26c31404732972e1c7043523399;hb=980bb6fa6d30d89d0d25df74930de24ae2dc1c2e;hp=96ad5dd647d5e67d26663ca7641a67ab5118c068;hpb=05d951a7ca3fce73baf6c8b04feb307084cc64a4;p=fedora-mingw.git

diff --git a/pango/mingw-pango.spec b/pango/mingw-pango.spec
index 96ad5dd..973a7f8 100644
--- a/pango/mingw-pango.spec
+++ b/pango/mingw-pango.spec
@@ -6,13 +6,18 @@
 
 Name:           mingw-pango
 Version:        1.21.6
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows Pango library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.pango.org
 Source0:        http://download.gnome.org/sources/pango/1.21/pango-%{version}.tar.bz2
+# Native pango uses a %post script to generate this, but the pango-querymodules.exe
+# binary is not something we can easily run on a Linux host. We could use wine by
+# wine isn't happy in a mock environment. So we just include a pre-generated copy
+# on basis that it won't ever change much
+Source1:        pango.modules
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,9 +30,8 @@ BuildRequires:  mingw-gettext
 BuildRequires:  mingw-cairo
 BuildRequires:  mingw-freetype
 BuildRequires:  mingw-fontconfig
-
-Requires(post): wine
-
+BuildRequires:  mingw-glib2
+BuildRequires:  pkgconfig
 
 %description
 MinGW Windows Pango library.
@@ -38,8 +42,7 @@ MinGW Windows Pango library.
 
 %build
 # Need to run the correct version of glib-mkenums.
-PATH=%{_mingw_bindir}:$PATH
-
+PATH=%{_mingw_bindir}:$PATH \
 %{_mingw_configure}
 make
 
@@ -50,6 +53,7 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT%{_mingw_sysconfdir}/pango/
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_mingw_sysconfdir}/pango/
 
 rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
 
@@ -57,15 +61,6 @@ rm -f $RPM_BUILD_ROOT/%{_mingw_libdir}/charset.alias
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%post
-wine %{_mingw_bindir}/pango-querymodules.exe \
-  > %{_mingw_sysconfdir}/pango/pango.modules
-
-%preun
-rm -f %{_mingw_sysconfdir}/pango/pango.modules
-
-
 %files
 %defattr(-,root,root)
 %{_mingw_bindir}/libpango-1.0-0.dll
@@ -97,6 +92,12 @@ rm -f %{_mingw_sysconfdir}/pango/pango.modules
 
 
 %changelog
+* Tue Sep 23 2008 Daniel P. Berrange <berrange@redhat.com> - 1.21.6-5
+- Remove use of wine in %post
+
+* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 1.21.6-4
+- Add dep on pkgconfig
+
 * Thu Sep 11 2008 Richard W.M. Jones <rjones@redhat.com> - 1.21.6-3
 - post/preun scripts to update the pango.modules list.