--- a/ChangeLog	Mon Aug 27 16:29:56 2007 +0000
+++ b/ChangeLog	Tue Aug 28 07:55:47 2007 +0000
@@ -1,3 +1,10 @@
+2007-08-28  Damien Carbery <[email protected]>
+
+	* SUNWevolution.spec: Add a new schemas files to %files and remove
+	  version number from another.
+	* base-specs/gconf-editor.spec: Move aclocal call and mkdir m4 as
+	  required by intltoolize call.
+
 2007-08-27  Damien Carbery <[email protected]>
 
 	* base-specs/pygtk2.spec: Bump to 2.11.0.

--- a/SUNWevolution.spec	Mon Aug 27 16:29:56 2007 +0000
+++ b/SUNWevolution.spec	Tue Aug 28 07:55:47 2007 +0000
@@ -190,7 +190,9 @@
   echo 'schemas="$SDIR/apps-evolution-mail-prompts-checkdefault-%{evolution.major_version}.schemas';
   echo '         $SDIR/bogo-junk-plugin.schemas';
   echo '         $SDIR/apps_evolution_addressbook.schemas';
+  echo '         $SDIR/apps-evolution-attachment-reminder.schemas';
   echo '         $SDIR/apps-evolution-mail-notification.schemas';
+  echo '         $SDIR/apps-evolution-mail-prompts-checkdefault.schemas';
   echo '         $SDIR/apps_evolution_calendar.schemas';
   echo '         $SDIR/apps_evolution_shell.schemas';
   echo '         $SDIR/evolution-mail.schemas"';
@@ -277,13 +279,15 @@
 %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas
-%{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder-%{evolution.major_version}.schemas
+%{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
 %{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 
 %changelog
+* Tue Aug 28 2007 - [email protected]
+- Add a new schemas files to %files and remove version number from another.
 * Wed Jul 11 2007 - [email protected]
 - Add a new schemas file to %files.
 * Wed Jun 06 2007 - [email protected]

--- a/base-specs/gconf-editor.spec	Mon Aug 27 16:29:56 2007 +0000
+++ b/base-specs/gconf-editor.spec	Tue Aug 28 07:55:47 2007 +0000
@@ -48,9 +48,10 @@
   CPUS=1
 fi
 
+aclocal $ACLOCAL_FLAGS
 libtoolize --force
+mkdir m4
 intltoolize --copy --force --automake
-aclocal $ACLOCAL_FLAGS
 automake -a -c -f
 autoconf
 ./configure --prefix=%{_prefix} \
@@ -88,6 +89,9 @@
 %{_datadir}/omf/gconf-editor/*.omf
 
 %changelog
+* Tue Aug 28 2007 - [email protected]
+- Move aclocal call and mkdir m4 as required by intltoolize call.
+
 * Mon Aug 27 2007 - [email protected]
 - Bump to 2.18.2.