diff --git a/.cvsignore b/.cvsignore
index bfae6a7..bceef84 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-color-manager-2.29.4.tar.gz
+gnome-color-manager-2.30.0.tar.gz
diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index 37e0ab6..71aa7ab 100644
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -1,13 +1,10 @@
-%define gtk2_version                    2.16.0
-%define dbus_glib_version               0.73
-%define unique_version                  1.0.0
-%define alphatag			20100222
+%define alphatag                        20100222
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Color management tools for GNOME
 Name:      gnome-color-manager
-Version:   2.29.4
+Version:   2.30.0
 #Release:   0.1.%{?alphatag}git%{?dist}
 Release:   1%{?dist}
 License:   GPLv2+
@@ -15,29 +12,17 @@ Group:     Applications/System
 URL:       http://projects.gnome.org/gnome-color-manager/
 Source0:   http://download.gnome.org/sources/gnome-color-manager/2.29/%{name}-%{version}.tar.gz
 #Source0:   http://download.gnome.org/sources/gnome-color-manager/2.29/%{name}-%{version}-%{?alphatag}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:  gtk2 >= %{gtk2_version}
 Requires:  gnome-icon-theme
-Requires:  unique >= %{unique_version}
 Requires:  shared-mime-info
-Requires:  dbus-glib >= %{dbus_glib_version}
-Requires:  dbus-x11
-Requires:  udev
-Requires:  vte
-Requires:  lcms
-Requires:  cups
-Requires:  polkit
-Requires:  PackageKit
 Requires:  shared-color-profiles
-Requires:  libcanberra >= %{libcanberra_version}
 Requires(post):   scrollkeeper
 Requires(pre):    GConf2
 Requires(post):   GConf2
 Requires(preun):  GConf2
 Requires(postun): scrollkeeper
 
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk2-devel >= 2.16.0
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: desktop-file-utils
@@ -45,17 +30,18 @@ BuildRequires: gettext
 BuildRequires: libtool
 BuildRequires: vte-devel
 BuildRequires: gnome-doc-utils
-BuildRequires: unique-devel >= %{unique_version}
+BuildRequires: unique-devel >= 1.0.0
 BuildRequires: intltool
 BuildRequires: libgudev1-devel
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
+BuildRequires: dbus-glib-devel >= 0.73
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXrandr-devel
 BuildRequires: gnome-desktop-devel
 BuildRequires: lcms-devel
 BuildRequires: cups-devel
+BuildRequires: sane-backends-devel
 BuildRequires: libtiff-devel
-BuildRequires: libcanberra-devel >= %{libcanberra_version}
+BuildRequires: libcanberra-devel
 
 %description
 gnome-color-manager is a session framework that makes it easy to manage, install
@@ -70,7 +56,6 @@ and generate color profiles in the GNOME desktop.
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 for i in gcm-prefs gcm-import ; do
@@ -85,9 +70,7 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-        %{_sysconfdir}/gconf/schemas/gnome-color-manager.schemas >/dev/null || :
+%gconf_schema_upgrade gnome-color-manager
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
@@ -96,18 +79,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-color-manager.schemas &> /dev/null || :
-fi
+gconf_schema_prepare gnome-color-manager
 
 %preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-color-manager.schemas &> /dev/null || :
-fi
+%gconf_schema_remove gnome-color-manager
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor
@@ -128,6 +103,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %dir %{_datadir}/gnome-color-manager/icons
 %{_datadir}/gnome-color-manager/targets/*.png
 %{_datadir}/gnome-color-manager/icons/*.svg
+#%{_datadir}/gnome-color-manager/icons/*.png
 %{_datadir}/man/man1/*.1.gz
 %{_datadir}/gnome/help/gnome-color-manager
 %{_datadir}/omf/gnome-color-manager
@@ -145,6 +121,17 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %dir %{_localstatedir}/lib/color
 
 %changelog
+* Mon Mar 29 2010 Richard Hughes <richard@hughsie.com> 2.30.0-1
+- New upstream release.
+
+* Tue Mar 09 2010 Richard Hughes <richard@hughsie.com> 2.29.4-2
+- Update to the latest version of the Fedora Packaging Guidelines
+- Remove the custom BuildRoot
+- Do not clean the buildroot before install
+- Use the gconf_schema defines for the GConf schemas
+- Remove some over-zealous Requires that are already picked up by rpm.
+- Resolves #571658
+
 * Mon Mar 01 2010 Richard Hughes <richard@hughsie.com> 2.29.4-1
 - New upstream release.
 
diff --git a/sources b/sources
index 4545eb8..ab8f3aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6511996954fd8c5e907517cb45fd3bd1  gnome-color-manager-2.29.4.tar.gz
+a46b61d7b2837c99c9c612ceb00bdb23  gnome-color-manager-2.30.0.tar.gz