--- a/ChangeLog	Sat Dec 18 11:08:45 2004 +0000
+++ b/ChangeLog	Mon Dec 20 02:28:18 2004 +0000
@@ -1,7 +1,14 @@
+2004-12-20  Glynn Foster  <[email protected]>
+
+	* gimp.spec, usermode.spec, xscreensaver.spec: Change the distribution
+	to Cinnabar, not Mercury.
+
 2004-12-27 Laszlo Kovacs <[email protected]>
+
 	* jdshelp.spec: tarball upgrade
 
 2004-12-17 Kieran Colfer <[email protected]>
+
 	* yast2-trans-*.spec:  Add
 	* Adding spec-files & tarballs for yast2 translations to build
 

--- a/gimp.spec	Sat Dec 18 11:08:45 2004 +0000
+++ b/gimp.spec	Mon Dec 20 02:28:18 2004 +0000
@@ -1,12 +1,12 @@
-%define subver 2.0
+%define subver 2.2
 %define microver 2
 
 Name:         gimp
 License:      GPL, LGPL
 Group:        System/GUI/GNOME
 Version:      %{subver}.%{microver}
-Release:      42
-Distribution: Mercury
+Release:      1
+Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 Summary:      The GIMP (GNU Image Manipulation Program)
 Source:       ftp://ftp.gimp.org/pub/gimp/v2.1/gimp-%{version}.tar.bz2
@@ -209,6 +209,9 @@
 %{_mandir}/man1/gimptool-%{subver}.1*
 
 %changelog
+* Mon Dec 20 2004 - [email protected]
+- Bump to 2.2
+
 * Fri Nov 12 2004 - [email protected]
 - Added --libdir and --bindir to configure opts so they can be redirected
   on Solaris

--- a/usermode.spec	Sat Dec 18 11:08:45 2004 +0000
+++ b/usermode.spec	Mon Dec 20 02:28:18 2004 +0000
@@ -7,7 +7,7 @@
 Group:			Applications/System
 Version:		1.68
 Release:		48
-Distribution:		Mercury
+Distribution:		Cinnabar
 Vendor:			Sun Microsystems, Inc.
 Summary:		Tools for certain user account management tasks.
 Source:			usermode-%{version}.tar.bz2

--- a/xscreensaver.spec	Sat Dec 18 11:08:45 2004 +0000
+++ b/xscreensaver.spec	Mon Dec 20 02:28:18 2004 +0000
@@ -8,7 +8,7 @@
 Release:	50
 License:	BSD
 Group:		Amusements/Graphics
-Distribution:	Mercury
+Distribution:	Cinnabar
 Vendor:		Sun Microsystems, Inc.
 Summary:	Screensaver and locker
 Source:		http://www.jwz.org/xscreensaver/xscreensaver-4.10.tar.gz