--- a/ChangeLog	Wed Aug 16 13:53:53 2006 +0000
+++ b/ChangeLog	Wed Aug 16 14:08:46 2006 +0000
@@ -1,3 +1,14 @@
+2006-08-16  Damien Carbery <[email protected]>
+
+	* totem.spec: Add patch, 05-automake-conditional, to fix an automake
+	issue. #351617.
+	* patches/totem-05-automake-conditional.diff: Added. #351617.
+	* orca.spec: Unbump, from 0.2.8 to 0.2.2, to get build to work.
+	* gnome-user-docs.spec: dos2unix some xml files that were breaking 
+	the build.
+	* patches/gimp-04-fixcompile.diff: Rework two chunks and remove one
+	upstream chunk.
+
 2006-08-16  Harry Lu <[email protected]>
 
 	* gnome-panel.spec: add new patch to fix 6460249.
@@ -22,10 +33,10 @@
 
 2006-08-14  Damien Carbery <[email protected]>
 
-	* mozilla.spec, ext-sources/mozilla.sh.in, ext-sources/mozilla-icon.png,
+	* mozilla.spec, ext-sources/mozilla.sh.in,
 	ext-sources/mozilla.desktop, ext-sources/mozilla-make-package.pl,
 	ext-sources/mozilla-rebuild-databases.pl.in, 
-	ext-sources/mozilla-psm-exclude-list,
+	ext-sources/mozilla-psm-exclude-list, ext-sources/mozilla-icon.png,
 	ext-sources/mozilla-xpcom-exclude-list, ext-sources/mozilla.1.gz,
 	ext-sources/mozilla-startscripts.tar, ext-sources/mozilla-exclude-list,
 	ext-sources/mozilla-chrome-lang.txt, ext-sources/mozilla-removed-list:

--- a/gnome-user-docs.spec	Wed Aug 16 13:53:53 2006 +0000
+++ b/gnome-user-docs.spec	Wed Aug 16 14:08:46 2006 +0000
@@ -30,6 +30,10 @@
 
 %prep
 %setup -q -n gnome-user-docs-%{version}
+for f in gnome2-user-guide/bg/*.xml gnome2-user-guide/zh_CN/*.xml; do
+  dos2unix -ascii $f $f
+done
+
 
 %build
 %ifos linux
@@ -73,6 +77,9 @@
 %{_datadir}/omf/*
 
 %changelog
+* Wed Aug 16 2006 - [email protected]
+- dos2unix some xml files that were breaking the build.
+
 * Wed Aug 09 2006 - [email protected]
 - Bump to 2.15.1.
 

--- a/orca.spec	Wed Aug 16 13:53:53 2006 +0000
+++ b/orca.spec	Wed Aug 16 14:08:46 2006 +0000
@@ -8,7 +8,7 @@
 Name:           orca
 License:        LGPL
 Group:          System/Library
-Version:        0.2.8
+Version:        0.2.2
 Release:        1
 Distribution:   Java Desktop System
 Vendor:	        Sun Microsystems, Inc.

--- a/patches/gimp-04-fixcompile.diff	Wed Aug 16 13:53:53 2006 +0000
+++ b/patches/gimp-04-fixcompile.diff	Wed Aug 16 14:08:46 2006 +0000
@@ -1,37 +1,20 @@
 --- gimp-2.3.9/libgimp/gimp.c-orig	2006-06-23 17:41:52.459680000 -0500
 +++ gimp-2.3.9/libgimp/gimp.c	2006-06-23 17:43:27.010326000 -0500
-@@ -23,6 +23,7 @@
+@@ -22,6 +22,7 @@
+ #include "config.h"
  
- #define _POSIX_SOURCE  /* all the sigaction stuff is POSIX */
- #define _SVID_SOURCE   /* except for SA_RESTART, it seems  */
+ #define _GNU_SOURCE  /* for the sigaction stuff */
 +#define __EXTENSIONS__
  
  #include <errno.h>
  #include <stdarg.h>
 --- gimp-2.3.9/app/main.c-orig	2006-06-23 17:51:04.746071000 -0500
 +++ gimp-2.3.9/app/main.c	2006-06-23 17:51:12.581709000 -0500
-@@ -20,6 +20,7 @@
+@@ -19,6 +19,7 @@
+ #include "config.h"
  
- #define _POSIX_SOURCE  /* all the sigaction stuff is POSIX */
- #define _SVID_SOURCE   /* except for SA_RESTART, it seems  */
+ #define _GNU_SOURCE  /* for the sigaction stuff */
 +#define __EXTENSIONS__
  
  #include <stdio.h>
  #include <stdlib.h>
---- gimp-2.3.9/plug-ins/common/sel_gauss.c-orig	2006-06-23 18:01:30.251322000 -0500
-+++ gimp-2.3.9/plug-ins/common/sel_gauss.c	2006-06-23 18:05:01.594896000 -0500
-@@ -713,9 +713,11 @@ matrixmult (const guchar  *src,
-   has_alpha = has_alpha ? 1 : 0;
- 
- #define EXPAND(BYTES, ALPHA)\
--  if (bytes == BYTES && has_alpha == ALPHA)\
--    return matrixmult_int (src, dest, width, height, mat, numrad,\
--                           BYTES, ALPHA, maxdelta, preview_mode);
-+  if (bytes == BYTES && has_alpha == ALPHA) {\
-+    matrixmult_int (src, dest, width, height, mat, numrad,\
-+                           BYTES, ALPHA, maxdelta, preview_mode);\
-+    return;\
-+  }
-   EXPAND (1, 0)
-   EXPAND (2, 1)
-   EXPAND (3, 0)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/totem-05-automake-conditional.diff	Wed Aug 16 14:08:46 2006 +0000
@@ -0,0 +1,42 @@
+--- totem-1.5.91/configure.in.orig	2006-08-16 12:44:36.971644000 +0100
++++ totem-1.5.91/configure.in	2006-08-16 12:45:11.146245000 +0100
+@@ -447,34 +447,31 @@
+ 	[],[enable_basic_plugin=yes])
+ AC_MSG_RESULT([$enable_basic_plugin])
+ 
+-AM_CONDITIONAL([ENABLE_BASIC_PLUGIN],[test "$enable_basic_plugin" = "yes"])
+-
+ AC_MSG_CHECKING([whether to enable the GMP browser plugin])
+ AC_ARG_ENABLE([gmp-plugin],
+ 	AS_HELP_STRING([--enable-gmp-plugin],[Whether to enable the GMP browser plugin]),
+ 	[],[enable_gmp_plugin=yes])
+ AC_MSG_RESULT([$enable_gmp_plugin])
+ 
+-AM_CONDITIONAL([ENABLE_GMP_PLUGIN],[test "$enable_gmp_plugin" = "yes"])
+-
+ AC_MSG_CHECKING([whether to enable the Complex browser plugin])
+ AC_ARG_ENABLE([complex-plugin],
+ 	AS_HELP_STRING([--enable-complex-plugin],[Whether to enable the complex browser plugin]),
+ 	[],[enable_complex_plugin=yes])
+ AC_MSG_RESULT([$enable_complex_plugin])
+ 
+-AM_CONDITIONAL([ENABLE_COMPLEX_PLUGIN],[test "$enable_complex_plugin" = "yes"])
+-
+ AC_MSG_CHECKING([whether to enable the NarrowSpace browser plugin])
+ AC_ARG_ENABLE([narrowspace-plugin],
+ 	AS_HELP_STRING([--enable-narrowspace-plugin],[Whether to enable the NarrowSpace browser plugin]),
+ 	[],[enable_narrowspace_plugin=yes])
+ AC_MSG_RESULT([$enable_narrowspace_plugin])
+ 
+-AM_CONDITIONAL([ENABLE_NARROWSPACE_PLUGIN],[test "$enable_narrowspace_plugin" = "yes"])
+-
+ fi
+ 
++AM_CONDITIONAL([ENABLE_BASIC_PLUGIN],[test "$enable_basic_plugin" = "yes"])
++AM_CONDITIONAL([ENABLE_GMP_PLUGIN],[test "$enable_gmp_plugin" = "yes"])
++AM_CONDITIONAL([ENABLE_COMPLEX_PLUGIN],[test "$enable_complex_plugin" = "yes"])
++AM_CONDITIONAL([ENABLE_NARROWSPACE_PLUGIN],[test "$enable_narrowspace_plugin" = "yes"])
++
+ dnl ********
+ dnl Nautilus
+ dnl ********

--- a/totem.spec	Wed Aug 16 13:53:53 2006 +0000
+++ b/totem.spec	Wed Aug 16 14:08:46 2006 +0000
@@ -20,6 +20,7 @@
 Patch2:       totem-02-menu-entry.diff
 Patch3:       totem-03-uninstalled-pc.diff
 Patch4:       totem-04-fixcd.diff
+Patch5:       totem-05-automake-conditional.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -140,6 +141,9 @@
 %{_includedir}/totem/*
 
 %changelog
+* Wed Aug 16 2006 - [email protected]
+- Add patch, 05-automake-conditional, to fix an automake issue. #351617.
+
 * Mon Aug 14 2006 - [email protected]
 - Bump to 1.5.91.