rpms/openoffice.org/F-8 workspace.allowcurloldies.patch, NONE, 1.1 openoffice.org.spec, 1.1333, 1.1334

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29223

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.allowcurloldies.patch 
Log Message:
add workspace.allowcurloldies.patch because curl became build-time incompatible post-F8 release

workspace.allowcurloldies.patch:

--- NEW FILE workspace.allowcurloldies.patch ---
Index: source/ucp/ftp/makefile.mk
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/ftp/makefile.mk,v
retrieving revision 1.16
retrieving revision 1.16.20.2
diff -u -r1.16 -r1.16.20.2
--- openoffice.org.orig/ucb/source/ucp/ftp/makefile.mk	5 Jun 2007 18:02:00 -0000	1.16
+++ openoffice.org/ucb/source/ucp/ftp/makefile.mk	8 Oct 2007 08:50:23 -0000	1.16.20.2
@@ -48,10 +48,6 @@
 
 .INCLUDE: settings.mk
 
-.IF "$(SYSTEM_CURL)" == "YES"
-CFLAGS+=-DCURL_NO_OLDIES
-.ENDIF
-
 # --- General -----------------------------------------------------
 
 # first target ( shared library )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1333
retrieving revision 1.1334
diff -u -r1.1333 -r1.1334
--- openoffice.org.spec	3 Dec 2007 15:02:16 -0000	1.1333
+++ openoffice.org.spec	3 Dec 2007 18:52:04 -0000	1.1334
@@ -154,6 +154,7 @@
 Patch72: workspace.sw8u10bf02.patch
 Patch73: openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
 Patch74: workspace.hsql1808.patch
+Patch75: workspace.allowcurloldies.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1103,6 +1104,7 @@
 %patch72 -p1 -b .workspace.sw8u10bf02.patch
 %patch73 -p1 -b .ooo83930.sw.flushanchors.patch
 %patch74 -p1 -b .workspace.hsql1808.patch
+%patch75 -p1 -b .workspace.allowcurloldies.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2805,6 +2807,8 @@
 %changelog
 * Wed Dec 03 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.7
 - Resolves: rhbz#303601 CVE-2007-4575 workspace.hsql1808.patch
+- add workspace.allowcurloldies.patch because curl became build-time incompatible
+  post F-8 release
 - add openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
 - add openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
 - Resolves: rhbz#386371 add workspace.sw8u10bf02.patch