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

diff --git a/pango/mingw-pango.spec b/pango/mingw-pango.spec
index 091cdba..973a7f8 100644
--- a/pango/mingw-pango.spec
+++ b/pango/mingw-pango.spec
@@ -1,19 +1,28 @@
-%include /usr/lib/rpm/mingw-defs
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-pango
 Version:        1.21.6
-Release:        1%{?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
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-iconv
@@ -21,6 +30,8 @@ BuildRequires:  mingw-gettext
 BuildRequires:  mingw-cairo
 BuildRequires:  mingw-freetype
 BuildRequires:  mingw-fontconfig
+BuildRequires:  mingw-glib2
+BuildRequires:  pkgconfig
 
 %description
 MinGW Windows Pango library.
@@ -30,7 +41,8 @@ MinGW Windows Pango library.
 %setup -q -n pango-%{version}
 
 %build
-PKG_CONFIG_PATH=%{_mingw_libdir}/pkgconfig \
+# Need to run the correct version of glib-mkenums.
+PATH=%{_mingw_bindir}:$PATH \
 %{_mingw_configure}
 make
 
@@ -40,12 +52,15 @@ 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
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root)
 %{_mingw_bindir}/libpango-1.0-0.dll
@@ -73,7 +88,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_libdir}/pkgconfig/pangowin32.pc
 %{_mingw_datadir}/gtk-doc/html/pango/
 %{_mingw_mandir}/man1/pango-querymodules.1*
+%{_mingw_sysconfdir}/pango/
+
 
 %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.
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.21.6-2
+- Run the correct glib-mkenums.
+
 * Tue Sep  9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.21.6-1
 - Initial RPM release