--- a/ChangeLog	Wed May 23 18:44:13 2012 +0000
+++ b/ChangeLog	Thu May 31 20:16:52 2012 +0000
@@ -1,3 +1,12 @@
+2012-05-31  Brian Cameron  <[email protected]>
+
+	* base-specs/shared-mime-info.spec: Bump to 1.0.
+	* base-specs/nautilus.spec, base-specs/pulseaudio.spec,
+	  base-specs/gnome-settings-daemon.spec, specs/SUNWdconf.spec:
+	  Add patch comments.
+	* base-specs/gnome-panel.spec: Add --disable-telepathy-glib so
+	  it does not build with this module we do not deliver.
+
 2012-05-23  Brian Cameron  <[email protected]>
 
 	* scripts/git-setup, scripts/git-format-patch: Add scripts to make it

--- a/base-specs/gnome-panel.spec	Wed May 23 18:44:13 2012 +0000
+++ b/base-specs/gnome-panel.spec	Thu May 31 20:16:52 2012 +0000
@@ -218,6 +218,7 @@
     --mandir=%{_mandir}	\
     --sysconfdir=%{_sysconfdir} \
     --disable-scrollkeeper \
+    --disable-telepathy-glib \
     %{gtk_doc_option}
 
 make
@@ -285,6 +286,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu May 31 2012 - [email protected]
+- Add --disable-telepathy-glib so it does not build with this module we do not
+  deliver.
 * Thu May 17 2012 - [email protected]
 - Bump to 3.4.2.1.
 * Wed May 09 2012 - [email protected]

--- a/base-specs/gnome-settings-daemon.spec	Wed May 23 18:44:13 2012 +0000
+++ b/base-specs/gnome-settings-daemon.spec	Thu May 31 20:16:52 2012 +0000
@@ -50,7 +50,7 @@
 Patch11:     gnome-settings-daemon-11-animations-uses-gconf.diff
 # date:2011-06-07 owner:yippi type:bug
 Patch12:     gnome-settings-daemon-12-dependencies.diff
-# date:2011-06-07 owner:yippi type:bug
+# date:2011-06-07 owner:yippi type:bug bugzilla:676620
 Patch13:     gnome-settings-daemon-13-uninstalled-pc.diff
 # date:2011-08-24 owner:yippi type:feature
 Patch14:     gnome-settings-daemon-14-mapfile.diff

--- a/base-specs/nautilus.spec	Wed May 23 18:44:13 2012 +0000
+++ b/base-specs/nautilus.spec	Thu May 31 20:16:52 2012 +0000
@@ -61,7 +61,7 @@
 Patch15:       nautilus-15-rename-places.diff
 #owner: yippi  date:2011-07-07 type:branding
 Patch16:       nautilus-16-libxml.diff
-#owner: yippi  date:2012-05-09 type:bug
+#owner: yippi  date:2012-05-09 type:bug bugzilla:676622
 Patch17:       nautilus-17-void-return.diff
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build

--- a/base-specs/pulseaudio.spec	Wed May 23 18:44:13 2012 +0000
+++ b/base-specs/pulseaudio.spec	Thu May 31 20:16:52 2012 +0000
@@ -35,11 +35,11 @@
 Patch6:                  pulseaudio-06-configure.diff
 # date:2011-11-30 owner:yippi type:bug
 Patch7:                  pulseaudio-07-sada.diff
-# date:2011-12-13 owner:yippi type:bug
+# date:2011-12-13 owner:yippi type:bug bugid:50266
 Patch8:                  pulseaudio-08-oss4.diff
 # date:2011-10-06 owner:yippi type:feature
 Patch9:                  pulseaudio-09-amd64.diff
-# date:2012-05-14 owner:yippi type:bug
+# date:2012-05-14 owner:yippi type:bug bugid:50268
 Patch10:                 pulseaudio-10-endian.diff
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 

--- a/base-specs/shared-mime-info.spec	Wed May 23 18:44:13 2012 +0000
+++ b/base-specs/shared-mime-info.spec	Thu May 31 20:16:52 2012 +0000
@@ -1,7 +1,7 @@
 #
 # spec file for package shared-mime-info
 #
-# Copyright (c) 2010 Sun Microsystems, Inc.
+# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -14,13 +14,13 @@
 Name:         shared-mime-info
 License:      GPLv2
 Group:        Hardware/Other
-Version:      0.80
+Version:      1.0
 Release:      1
 Distribution: Java Desktop System
 Vendor:       freedesktop.org
 Summary:      Core Common Mime Type Database
 #Source:       http://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.bz2
-Source:       http://freedesktop.org/~hadess/%{name}-%{version}.tar.bz2
+Source:       http://freedesktop.org/~hadess/%{name}-%{version}.tar.xz
 Source1:      defaults.list
 %if %build_l10n
 Source2:                 l10n-configure.sh
@@ -57,8 +57,8 @@
 bash -x %SOURCE2 --enable-copyright
 %endif
 
-aclocal $ACLOCAL_FLAGS
-automake -a -c -f
+aclocal-1.11 $ACLOCAL_FLAGS
+automake-1.11 -a -c -f
 autoconf
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --mandir=%{_mandir}
 make -j $CPUS
@@ -88,6 +88,8 @@
 %{_datadir}/application-registry
 
 %changelog
+* Thu May 31 2012 - [email protected]
+- Bump to 1.0.
 * Thu Oct 21 2010 - [email protected]
 - Bump to 0.80.
 * Tue Apr 20 2010 - [email protected]

--- a/specs/SUNWdconf.spec	Wed May 23 18:44:13 2012 +0000
+++ b/specs/SUNWdconf.spec	Thu May 31 20:16:52 2012 +0000
@@ -18,6 +18,7 @@
 Version:                 0.12.1
 License:                 LGPL v2.1
 Source:			 http://ftp.gnome.org/pub/GNOME/sources/dconf/0.12/dconf-%{version}.tar.xz
+# date:2012-05-22 owner:yippi type:bug bugzilla:676619
 Patch1:                  dconf-01-compile.diff
 SUNW_BaseDir:            %{_basedir}
 SUNW_Copyright:          %{name}.copyright