diff --git a/.cvsignore b/.cvsignore
index 7ad3a72..4143e0f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pango-0.17.tar.gz
+pango-0.23.90.tar.gz
diff --git a/pango.spec b/pango.spec
index 16d44f9..ac5007b 100644
--- a/pango.spec
+++ b/pango.spec
@@ -1,11 +1,16 @@
-
 # Something's not quite right with libtool....
 %define __libtoolize :
 
-Summary: System for layout and rendering of internationalized text
+%define glib2_base_version 1.3.12
+%define glib2_extra_version .90-1 
+%define glib2_version %{glib2_base_version}%{glib2_extra_version}
+%define pkgconfig_version 0.8
+%define freetype_version 2.0.3
+
+Summary: System for layout and rendering of internationalized text.
 Name: pango
-Version: 0.17
-Release: 2
+Version: 0.23.90
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gtk.org/pub/gtk/v1.3/pango-%{version}.tar.gz
@@ -14,33 +19,69 @@ URL: http://www.pango.org
 BuildRoot: %{_tmppath}/pango-%{PACKAGE_VERSION}-root
 
 # We need to prereq this so we can run pango-querymodules
-Prereq: glib2 >= 1.3.6
-BuildRequires: glib2-devel
-BuildRequires: pkgconfig >= 0.7
-BuildRequires: freetype-devel >= 2.0.3
+Prereq: glib2 >= %{glib2_version}
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: pkgconfig >= %{pkgconfig_version}
+BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: XFree86-devel >= 4.0.2
 Obsoletes: pango-gtkbeta, fribidi-gtkbeta
 
 %description
 Pango is a system for layout and rendering of internationalized text.
 
+
 %package devel
-Summary:  System for layout and rendering of internationalized text
+Summary: System for layout and rendering of internationalized text.
 Group: Development/Libraries
 Requires: pango = %{PACKAGE_VERSION}
 Requires: XFree86-devel
-Requires: glib2-devel
-Requires: freetype-devel >= 2.0.3
+Requires: glib2-devel >= %{glib2_version}
+Requires: freetype-devel >= %{freetype_version}
 Obsoletes: fribidi-gtkbeta-devel, pango-gtkbeta-devel
 
 %description devel
-The pango-devel package includes the static libraries, header files
+The pango-devel package includes the static libraries, header files,
 and developer docs for the pango package.
 
 Install pango-devel if you want to develop programs which will use
 pango.
 
 %changelog
+* Wed Jan  2 2002 Havoc Pennington <hp@redhat.com>
+- new snap 0.23.90
+
+* Sun Nov 25 2001 Havoc Pennington <hp@redhat.com>
+- rebuild with 64-bit-fixed glib
+
+* Sun Nov 25 2001 Havoc Pennington <hp@redhat.com>
+- Version 0.22
+- add explicit check for required glib2 version before we do the build,
+  so we don't end up with bad RPMs on --nodeps builds
+- PreReq the glib2_version version, instead of 1.3.8 hardcoded that 
+  no one had updated recently
+
+* Thu Oct 25 2001 Owen Taylor <otaylor@redhat.com>
+- Version 0.21
+
+* Thu Oct  4 2001 Havoc Pennington <hp@redhat.com>
+- cvs snap
+- new cvs snap with a bugfix
+
+* Thu Sep 27 2001 Havoc Pennington <hp@redhat.com>
+- sync with Owen's changes, fix up dependency versions
+
+* Wed Sep 19 2001 Havoc Pennington <hp@redhat.com>
+- 0.19
+
+* Mon Sep 10 2001 Havoc Pennington <hp@redhat.com>
+- build CVS snap
+
+* Wed Sep 05 2001 Havoc Pennington <hp@redhat.com>
+- no relinking junk
+
+* Tue Sep  4 2001 root <root@dhcpd37.meridian.redhat.com>
+- Version 0.18
+
 * Fri Jul 20 2001 Owen Taylor <otaylor@redhat.com>
 - Configure --disable-gtk-doc
 - BuildRequires freetype-devel, XFree86-devel
@@ -103,6 +144,13 @@ pango.
 %setup -n pango-%{version}
 
 %build
+
+## ensure that --nodeps doesn't mess things up
+if ! pkg-config --atleast-version=%{glib2_base_version} glib-2.0; then 
+  echo "glib2-devel does not meet the build requirements"
+  exit 1
+fi
+
 rm ltmain.sh && cp %{SOURCE2} ltmain.sh
 %configure --without-qt --disable-gtk-doc
 make
diff --git a/sources b/sources
index cd0e933..dd02437 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2dd051d1a6274dd315e00ab4a86a5070  pango-0.17.tar.gz
+a486bd217f6a103c30d4200a2c61b347  pango-0.23.90.tar.gz