diff --git a/.cvsignore b/.cvsignore
index 76908e0..ee3ff5a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pango-1.1.1.tar.gz
+pango-1.1.4.tar.bz2
diff --git a/pango.spec b/pango.spec
index f72b2d2..94c94bd 100644
--- a/pango.spec
+++ b/pango.spec
@@ -1,22 +1,23 @@
-%define glib2_base_version 2.0.0
-%define glib2_version %{glib2_base_version}-1
+%define glib2_base_version 2.0.6
+%define glib2_version %{glib2_base_version}-3
 %define pkgconfig_version 0.12
 %define freetype_version 2.1.2-2
-%define fontconfig_version 0.0.1.020626.1517-2
+%define fontconfig_version 2.0
 %define xft_version 1.9.1.020626.1517-1
 
 Summary: System for layout and rendering of internationalized text.
 Name: pango
-Version: 1.1.1
+Version: 1.1.4
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
-Source: ftp://ftp.gtk.org/pub/gtk/v2.1/pango-%{version}.tar.gz
+Source: ftp://ftp.gtk.org/pub/gtk/v2.1/pango-%{version}.tar.bz2
 URL: http://www.pango.org
 BuildRoot: %{_tmppath}/pango-%{PACKAGE_VERSION}-root
 
 # We need to prereq this so we can run pango-querymodules
 Prereq: glib2 >= %{glib2_version}
+Requires: freetype-devel >= %{freetype_version}
 BuildRequires: libtool >= 1.4.2-10
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pkgconfig >= %{pkgconfig_version}
@@ -59,6 +60,13 @@ pango.
 
 %build
 
+## FIXME remove this hack when X is fixed
+export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/X11R6/lib64/pkgconfig
+if ! pkg-config --exists xft ; then
+        echo "No xft.pc!"
+        exit 1
+fi
+
 %configure --without-qt --disable-gtk-doc
 make
 
@@ -67,12 +75,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
 
+# Remove files that should not be packaged
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
+PANGOXFT_SO=$RPM_BUILD_ROOT%{_libdir}/libpangoxft-1.0.so
+if ! test -e $PANGOXFT_SO; then
+        echo "$PANGOXFT_SO not found; did not build with Xft support?"
+        ls $RPM_BUILD_ROOT%{_libdir}
+        exit 1
+fi      
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-%{_prefix}/bin/pango-querymodules > /etc/pango/pango.modules
+%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules
 
 %postun -p /sbin/ldconfig
 
@@ -80,22 +98,49 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc README AUTHORS COPYING ChangeLog TODO
 %doc examples/HELLO.utf8
-%{_prefix}/lib/libpango*-*.so.*
-%{_prefix}/bin/pango-querymodules
-%{_prefix}/lib/pango
-%config /etc/pango/pangox.aliases
-%ghost /etc/pango/pango.modules
+%{_libdir}/libpango*-*.so.*
+%{_bindir}/pango-querymodules
+%{_libdir}/pango
+%dir %{_sysconfdir}/pango
+%config %{_sysconfdir}/pango/pangox.aliases
+%ghost %{_sysconfdir}/pango/pango.modules
 
 
 %files devel
 %defattr(-, root, root)
-%{_prefix}/lib/libpango*.so
-%{_prefix}/include/*
-%{_prefix}/lib/pkgconfig/*
-%{_prefix}/share/gtk-doc/*
+%{_libdir}/libpango*.so
+%{_includedir}/*
+%{_libdir}/pkgconfig/*
+%{_datadir}/gtk-doc/*
 
 
 %changelog
+* Tue Dec  3 2002 Owen Taylor <otaylor@redhat.com>
+- Version 1.1.4
+
+* Thu Nov 21 2002 Havoc Pennington <hp@redhat.com>
+- change PKG_CONFIG_PATH hack to also search /usr/X11R6/lib64/pkgconfig
+
+* Wed Nov 20 2002 Havoc Pennington <hp@redhat.com>
+- explicitly require pangoxft to be built, so we catch situations such
+  as xft.pc moving to /usr/X11R6
+- also add /usr/X11R6/lib/pkgconfig to PKG_CONFIG_PATH as a temporary 
+  hack
+
+* Thu Nov  7 2002 Havoc Pennington <hp@redhat.com>
+- 1.1.3
+
+* Thu Oct 31 2002 Owen Taylor <otaylor@redhat.com> 1.1.1-5
+- Require the necessary freetype version, don't just
+  BuildRequires it (#74744)
+
+* Thu Oct 31 2002 Owen Taylor <otaylor@redhat.com> 1.1.1-4
+- Own /etc/pango (#73962, Enrico Scholz)
+- Remove .la files from the build root
+
+* Mon Oct  7 2002 Havoc Pennington <hp@redhat.com>
+- require glib 2.0.6-3, try rebuild on more arches
+
 * Wed Aug 21 2002 Owen Taylor <otaylor@redhat.com>
 - Version 1.1.1 (main change, fixes font selection for FT2 backend, 
   as in gdmgreeter)
diff --git a/sources b/sources
index 3d8c59d..dc09a4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1922d1c1a59644d7a16250c8f4710e5b  pango-1.1.1.tar.gz
+af374bb015fe5148b0e453b97033f700  pango-1.1.4.tar.bz2