diff --git a/pango.spec b/pango.spec
index 80f6b88..60a563b 100644
--- a/pango.spec
+++ b/pango.spec
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text.
 Name: pango
 Version: 1.2.5
-Release: 3.0
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gtk.org/pub/gtk/v2.1/pango-%{version}.tar.bz2
@@ -89,10 +89,18 @@ if ! test -e $PANGOXFT_SO; then
         exit 1
 fi      
 
+# autoconf changes linux to linux-gnu
+case "%{_host}" in
+  *linux) host="%{_host}-gnu" 
+  ;;
+  *) host="%{_host}"
+  ;;
+esac
+
 # We need to have separate 32-bit and 64-bit pango-querymodules binaries
 # for places where we have two copies of the Pango libraries installed.
 # (we might have x86_64 and i686 packages on the same system, for example.)
-case "%{_host}" in
+case "$host" in
   alpha*|ia64*|ppc64*|s390x*|x86_64*)
    mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules $RPM_BUILD_ROOT%{_bindir}/pango-querymodules-64
    ;;
@@ -102,26 +110,41 @@ case "%{_host}" in
 esac
 
 rm $RPM_BUILD_ROOT%{_sysconfdir}/pango/pango.modules
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pango/%{_host}
-touch $RPM_BUILD_ROOT%{_sysconfdir}/pango/%{_host}/pango.modules
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pango/$host
+touch $RPM_BUILD_ROOT%{_sysconfdir}/pango/$host/pango.modules
+
+#
+# We need the substitution of $host so we use an external
+# file list
+#
+echo %dir %{_sysconfdir}/pango/$host > modules.files
+echo %ghost %{_sysconfdir}/pango/$host/pango.modules >> modules.files
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
+# autoconf changes linux to linux-gnu
 case "%{_host}" in
+  *linux) host="%{_host}-gnu" 
+  ;;
+  *) host="%{_host}"
+  ;;
+esac
+
+case "$host" in
   alpha*|ia64*|ppc64*|s390x*|x86_64*)
-   %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/%{_host}/pango.modules
+   %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/$host/pango.modules
    ;;
   *)
-   %{_bindir}/pango-querymodules-32 > %{_sysconfdir}/pango/%{_host}/pango.modules
+   %{_bindir}/pango-querymodules-32 > %{_sysconfdir}/pango/$host/pango.modules
    ;;
 esac
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f modules.files
 %defattr(-, root, root)
 %doc README AUTHORS COPYING ChangeLog TODO
 %doc examples/HELLO.utf8
@@ -130,8 +153,6 @@ esac
 %{_libdir}/pango
 %dir %{_sysconfdir}/pango
 %config %{_sysconfdir}/pango/pangox.aliases
-%dir %{_sysconfdir}/pango/%{_host}
-%ghost %{_sysconfdir}/pango/%{_host}/pango.modules
 
 
 %files devel
@@ -143,6 +164,9 @@ esac
 
 
 %changelog
+* Thu Dec 18 2003 Owen Taylor <otaylor@redhat.com> 1.2.5-4
+- Deal with autoconf changing -linux to -linux-gnu (#112387)
+
 * Mon Dec  8 2003 Owen Taylor <otaylor@redhat.com> 1.2.5-3.0
 - Package pango-querymodules as pango-querymodules-{32,64}; look for 
   pango.modules in an architecture-specific directory.