From: Daniel P. Berrange <"Daniel P. Berrange "> Date: Tue, 23 Sep 2008 09:37:54 +0000 (-0400) Subject: Remove use of wine from pango %post X-Git-Url: http://git.annexia.org/?p=fedora-mingw.git;a=commitdiff_plain;h=38c89b4daedbf23d96dd48909223937f5ce92312 Remove use of wine from pango %post --- diff --git a/pango/mingw-pango.spec b/pango/mingw-pango.spec index 8e185a3..973a7f8 100644 --- a/pango/mingw-pango.spec +++ b/pango/mingw-pango.spec @@ -6,13 +6,18 @@ Name: mingw-pango Version: 1.21.6 -Release: 4%{?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 @@ -28,9 +33,6 @@ BuildRequires: mingw-fontconfig BuildRequires: mingw-glib2 BuildRequires: pkgconfig -Requires(post): wine - - %description MinGW Windows Pango library. @@ -51,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 @@ -58,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 @@ -98,6 +92,9 @@ rm -f %{_mingw_sysconfdir}/pango/pango.modules %changelog +* Tue Sep 23 2008 Daniel P. Berrange - 1.21.6-5 +- Remove use of wine in %post + * Thu Sep 11 2008 Daniel P. Berrange - 1.21.6-4 - Add dep on pkgconfig diff --git a/pango/pango.modules b/pango/pango.modules new file mode 100644 index 0000000..79538e8 --- /dev/null +++ b/pango/pango.modules @@ -0,0 +1,35 @@ +# Pango Modules file +# Automatically generated file, do not edit +# +# ModulesPath = Z:\usr\i686-pc-mingw32\sys-root\mingw\lib\pango\1.6.0\modules +# +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-thai-fc.dll" ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-win32.dll" BasicScriptEngineWin32 PangoEngineShape PangoRenderWin32 common: +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-fc.dll" sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-syriac-fc.dll" SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-khmer-fc.dll" KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-lang.dll" ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-basic-fc.dll" BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common: +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-arabic-fc.dll" ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-indic-lang.dll" sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hebrew-fc.dll" HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-tibetan-fc.dll" TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:* +"Z:\\usr\\i686-pc-mingw32\\sys-root\\mingw\\lib\\pango\\1.6.0\\modules\\pango-hangul-fc.dll" HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:*