--- a/ChangeLog	Thu Aug 02 07:41:42 2007 +0000
+++ b/ChangeLog	Thu Aug 02 09:16:49 2007 +0000
@@ -1,5 +1,8 @@
 2007-08-02  Damien Carbery <[email protected]>
 
+	* base-specs/flac.spec: Add upstream patch, 03-ogg-build-fix, to fix
+	  build error.
+	* patches/flac-03-ogg-build-fix.diff: Fixes compilation error.
 	* patches/evolution-data-server-02-endian.diff: Commit a hacky version
 	  that hard-codes path to glib headers. Did this because I cannot get
 	  autofoo method to work.

--- a/base-specs/flac.spec	Thu Aug 02 07:41:42 2007 +0000
+++ b/base-specs/flac.spec	Thu Aug 02 09:16:49 2007 +0000
@@ -21,6 +21,8 @@
 Patch1:       flac-01-forte.diff
 #owner:sh162551 date:2007-06-29 type:bug bugzilla:1723295 bugster:6559191
 Patch2:       flac-02-c++.diff
+#owner:dcarbery date:2007-08-02 type:bug bugzilla:1760786 state:upstream
+Patch3:       flac-03-ogg-build-fix.diff
 URL:          http://flac.sourceforge.net/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_docdir}/%{name}
@@ -51,6 +53,7 @@
 %patch1 -p1
 %patch2 -p1
 %endif
+%patch3 -p1
 
 %build
 %ifos linux
@@ -112,6 +115,8 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Thu Aug 02 2007 - [email protected]
+- Add upstream patch, 03-ogg-build-fix, to fix build error.
 * Tue Jul 31 2007 - [email protected]
 - Bump to 1.2.0.
 * Fri Jun 29 2007 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/flac-03-ogg-build-fix.diff	Thu Aug 02 09:16:49 2007 +0000
@@ -0,0 +1,15 @@
+--- flac-1.2.0/src/flac/encode.c	2007/07/10 02:10:44	1.187
++++ flac-1.2.0/src/flac/encode.c	2007/07/26 08:01:40	1.188
+@@ -2177,10 +2177,12 @@
+ 		return true;
+ 
+ 	if(num_requested_seek_points < 0) {
++#if FLAC__HAS_OGG
+ 		/*@@@@@@ workaround ogg bug: too many seekpoints makes table not fit in one page */
+ 		if(e->use_ogg && e->total_samples_to_encode > 0 && e->total_samples_to_encode / e->sample_rate / 10 > 230)
+ 			requested_seek_points = "230x;";
+ 		else 
++#endif
+ 			requested_seek_points = "10s;";
+ 		num_requested_seek_points = 1;
+ 	}