Merge branch 'f16'

Conflicts:
	gnome-color-manager.spec

.gitignore

@@ -12,3 +12,4 @@ gnome-color-manager-2.31.4.tar.bz2
 /gnome-color-manager-3.1.91.tar.xz
 /gnome-color-manager-3.1.92.tar.xz
 /gnome-color-manager-3.2.0.tar.xz
+/gnome-color-manager-3.2.1.tar.xz

gnome-color-manager.spec

@@ -1,12 +1,11 @@
 Summary:   Color management tools for GNOME
 Name:      gnome-color-manager
-Version:   3.2.0
-Release:   4%{?dist}
+Version:   3.2.1
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://projects.gnome.org/gnome-color-manager/
 Source0:   http://download.gnome.org/sources/gnome-color-manager/3.2/%{name}-%{version}.tar.xz
-Patch0:    0001-Initialize-error-pointer-for-gdk_pixbuf_new_from_fil.patch
 
 Requires:  color-filesystem >= 1-7
 Requires:  gnome-icon-theme
@@ -50,7 +49,6 @@ and generate color profiles in the GNOME desktop.
 
 %prep
 %setup -q
-%patch0 -p1 -b .rui
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -104,6 +102,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/dbus-1/services/org.gnome.ColorManager.service
 
 %changelog
+* Mon Oct 17 2011 Richard Hughes <rhughes@redhat.com> - 3.2.1-1
+- New upstream version.
+
 * Fri Oct 14 2011 Rex Dieter <rdieter@fedoraproject.org> - 3.2.0-4
 - rebuild (exiv2)
 

sources

@@ -1 +1 @@
-189d51eb28d7b60a95f502b823b297c4  gnome-color-manager-3.2.0.tar.xz
+76d36a6e915cd4fe08ea25a2f7ed914b  gnome-color-manager-3.2.1.tar.xz