diff --git a/.cvsignore b/.cvsignore
index 46a3a90..bbce693 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libgnomecanvas-1.108.0.90.tar.gz
+libgnomecanvas-1.117.0.tar.bz2
diff --git a/libgnomecanvas.spec b/libgnomecanvas.spec
index 9c4710f..ac19e6b 100644
--- a/libgnomecanvas.spec
+++ b/libgnomecanvas.spec
@@ -1,13 +1,22 @@
-%define gtk2_version 1.3.12.90
-%define libart_lgpl_version 2.3.7.91
-%define libglade2_version 1.99.5.90
+%define gtk2_version 2.0
+%define libart_lgpl_version 2.3.8
+%define libglade2_version 1.99.12
+
+###### This is all cut-and-paste boilerplate 
+%define version_stamp_dir %{_datadir}/rpm-versions/%{name}
+%define version_stamp_file %{_datadir}/rpm-versions/%{name}/%{version}-%{release}
+%define install_version_stamp mkdir -p $RPM_BUILD_ROOT/%{version_stamp_dir} && echo %{version}-%{release} > $RPM_BUILD_ROOT/%{version_stamp_file}
+%define devel_version_stamp_dir %{_datadir}/rpm-versions/%{name}-devel
+%define devel_version_stamp_file %{_datadir}/rpm-versions/%{name}-devel/%{version}-%{release}
+%define install_devel_version_stamp mkdir -p $RPM_BUILD_ROOT/%{devel_version_stamp_dir} && echo %{version}-%{release} > $RPM_BUILD_ROOT/%{devel_version_stamp_file}
+###### End cut-and-paste boilerplate
 
 Summary: GnomeCanvas widget
 Name: libgnomecanvas
-Version: 1.108.0.90
-Release: 1
+Version: 1.117.0
+Release: 2
 URL: http://www.gnome.org/
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.bz2
 License: LGPL
 Group: System Environment/Libraries 
 BuildRoot: %{_tmppath}/%{name}-root
@@ -25,8 +34,8 @@ Tk canvas widget but has evolved quite a bit over time.
 %package devel
 Summary: Libraries and headers for libgnomecanvas.
 Group: Development/Libraries
-Requires:	%name = %{version}
-Conflicts:      gnome-libs-devel < 1.4.1.2
+Requires: %name = %{version}
+Conflicts: gnome-libs-devel < 1.4.1.2
 Requires: gtk2-devel >= %{gtk2_version}
 Requires: libart_lgpl-devel >= %{libart_lgpl_version}
 Requires: libglade2-devel >= %{libglade2_version}
@@ -41,6 +50,20 @@ Tk canvas widget but has evolved quite a bit over time.
 %setup -q
 
 %build
+
+## ensure that --nodeps doesn't mess things up (configure.in also
+## checks this in theory, but in principle the RPM and configure.in
+## could require different versions, and a double check is nice
+## anyhow)
+if ! pkg-config --atleast-version=%{gtk2_version} gtk+-2.0; then 
+  echo "gtk-devel does not meet the build requirements"
+  exit 1
+fi
+if ! pkg-config --atleast-version=%{libglade2_version} libglade-2.0; then 
+  echo "libglade2-devel does not meet the build requirements"
+  exit 1
+fi
+
 %configure
 make %{?_smp_mflags}
 
@@ -48,6 +71,9 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=$RPM_BUILD_ROOT
 
+%install_version_stamp
+%install_devel_version_stamp
+
 %find_lang %name
 
 %clean
@@ -66,13 +92,40 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
+%{version_stamp_dir}
 
 %{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
+%{devel_version_stamp_dir}
 
 %changelog
+* Fri May 17 2002 Havoc Pennington <hp@redhat.com>
+- rebuild in different environment
+
+* Fri May 17 2002 Havoc Pennington <hp@redhat.com>
+- 1.117.0
+
+* Thu May  2 2002 Havoc Pennington <hp@redhat.com>
+- rebuild for new libglade
+- 1.116.0
+
+* Thu Apr  4 2002 Jeremy Katz <katzj@redhat.com>
+- 1.114.0
+
+* Tue Feb 19 2002 Alex Larsson <alexl@redhat.com>
+- Add nasty version check stuff.
+
+* Thu Feb 14 2002 Havoc Pennington <hp@redhat.com>
+- 1.111.0
+
+* Wed Jan 30 2002 Owen Taylor <otaylor@redhat.com>
+- Version 1.110.0
+
+* Fri Jan 25 2002 Havoc Pennington <hp@redhat.com>
+- rebuild in rawhide
+
 * Wed Jan  2 2002 Havoc Pennington <hp@redhat.com>
 - 1.108.0.90 cvs snap
 
diff --git a/sources b/sources
index 365aca1..4d01b5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-518561843f0a6f57d1671de4f29a6c1e  libgnomecanvas-1.108.0.90.tar.gz
+e294e835dd6e6ed48466ae40f39a0d8b  libgnomecanvas-1.117.0.tar.bz2