diff --git a/.cvsignore b/.cvsignore
index 14803a8..f252db1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-gedit-0.9.7.tar.gz
-gedit-pofiles.tar.gz
+gedit-1.121.1.tar.bz2
diff --git a/gedit.spec b/gedit.spec
index 9f1690f..a976588 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,27 +1,28 @@
+%define glib2_version 2.0.0
+%define gtk2_version 2.0.2
+%define libgnomeui_version 1.117.2
+%define libgnomeprint_version 1.114.0
+%define libgnomeprintui_version 1.114.0
+
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version:	0.9.7
-Release:	8
+Version:	1.121.1
+Release:        1
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
-Source0:	ftp://ftp.gnome.org/pub/GNOME/sources/gedit/gedit-%{version}.tar.gz
-Source1:	gedit-pofiles.tar.gz
+Source0:	ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gedit/gedit-%{version}.tar.bz2
 URL:		http://gedit.sourceforge.net/
 BuildRoot:	%{_tmppath}/gedit-%{version}-root
 
-Requires:	gtk+ >= 1.2.7
-Requires:	gnome-libs >= 1.0.55
-Requires:	gnome-print >= 0.18
+PreReq:         scrollkeeper >= 0.1.4
+PreReq:         GConf2
 
-BuildRequires:  libglade-devel gtk+-devel gnome-print-devel gdk-pixbuf-devel
-BuildRequires:  /usr/bin/automake-1.4
-
-Patch1:		gedit-0.9.7-cjk.patch
-Patch2:		gedit-0.9.4-print.patch
-Patch3:         gedit-0.9.4-cflags.patch
-Patch4:		gedit-0.9.4-printprefs.patch
-Patch5:         gedit-0.9.7-gettext-font.patch
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
+BuildRequires: libgnomeprintui-devel >= %{libgnomeprintui_version}
+BuildRequires: libgnomeprint-devel >= %{libgnomeprint_version}
 
 %description
 gEdit is a small but powerful text editor designed specifically for
@@ -44,50 +45,66 @@ Install gedit-devel if you want to write plug-ins for gEdit.
 
 %prep
 %setup -q
-%patch1 -p1 -b .cjk
-## %patch2 -p1 -b .print
-%patch3 -p1 -b .cflags
-## %patch4 -p1 -b .printprefs
-%patch5 -p1 -b .gettext-font
-# unpack our translations
-tar zxf %{SOURCE1}
 
 %build
 
-libtoolize --copy --force
-aclocal-1.4 -I macros
-automake-1.4
-autoconf
-
 %configure
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall
-if [ -f /usr/lib/rpm/find-lang.sh ] ; then
- /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name
-fi
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+
+scrollkeeper-update
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+SCHEMAS="gedit.schemas"
+for S in $SCHEMAS; do
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+done
+
+%postun
+scrollkeeper-update
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc README COPYING ChangeLog NEWS TODO AUTHORS INSTALL THANKS FAQ
-%{_bindir}/gedit
-%{_datadir}/gnome/apps/*/*
-%{_datadir}/gnome/help/gedit
-%{_datadir}/pixmaps/*
-%{_datadir}/mime-info/*
-%{_datadir}/gedit
-%{_libdir}/gedit
-%{_mandir}/*/*
+%{_datadir}/gedit-2
+%{_datadir}/pixmaps
+%{_datadir}/gnome
+%{_datadir}/omf
+%{_datadir}/applications
+%{_libdir}/gedit-2
+%{_bindir}/*
+%{_sysconfdir}/gconf/schemas/*
 
 %changelog
-* Thu Apr 18 2002 Paul Gampe <pgampe@redhat.com>
-- fix zh_CN po file for fonts
+* Wed Jun  5 2002 Havoc Pennington <hp@redhat.com>
+- 1.121.1
+
+* Sun May 26 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Tue May 21 2002 Havoc Pennington <hp@redhat.com>
+- rebuild in different environment
+
+* Tue May 21 2002 Havoc Pennington <hp@redhat.com>
+- 1.120.0
+
+* Fri May  3 2002 Havoc Pennington <hp@redhat.com>
+- 1.118.0
+
+* Fri Apr 19 2002 Havoc Pennington <hp@redhat.com>
+- move to gnome 2 version
 
 * Thu Apr 18 2002 Havoc Pennington <hp@redhat.com>
 - fix ko.po
diff --git a/sources b/sources
index 38d8a9d..595e75f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-a02667dd67e46efdbdb6f875442506b1  gedit-0.9.7.tar.gz
-54d371e57267920d7675b887bc309dd1  gedit-pofiles.tar.gz
+eb1dd7c174e6e9555d500617f61ffc84  gedit-1.121.1.tar.bz2