SPECS (DEVEL): openoffice.org.spec - use patches/hotfixes for gcc fix

[glen]

Author: glen                         Date: Mon Mar 10 12:19:16 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- use patches/hotfixes for gcc fix

---- Files affected:
SPECS:
   openoffice.org.spec (1.775.2.58 -> 1.775.2.59) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.775.2.58 SPECS/openoffice.org.spec:1.775.2.59
--- SPECS/openoffice.org.spec:1.775.2.58	Sun Mar  9 19:31:35 2008
+++ SPECS/openoffice.org.spec	Mon Mar 10 13:19:10 2008
@@ -2109,7 +2109,6 @@
 
 # fixes for the patch subsystem
 %patch0 -p1
-%patch1 -p1
 
 # mdbtools_fix.diff needs review
 #%patch50 -p1
@@ -2119,11 +2118,13 @@
 #%patch51 -p1
 #%endif
 
+ln -s %{PATCH1} patches/hotfixes/%{basename:%{PATCH1}}.diff
+
 # TODO: use patches/hotfixes dir from now on
 echo "[ PLDOnly ]" >> patches/src680/apply
 
 # remove patches (temporary FIX)
-%{__sed} -i -e "s#, STLport5, OOXSTLport5,#, #g" patches/src680/apply
+%{__sed} -i -e "s/, STLport5, OOXSTLport5,/, /g" patches/src680/apply
 
 # patches applied by ooo (extension .diff is required)
 for P in \
@@ -2183,7 +2184,7 @@
 [ "$RPM_BUILD_NR_THREADS" = "%{__make}" ] && RPM_BUILD_NR_THREADS=1
 RPM_BUILD_NR_THREADS=$(echo $RPM_BUILD_NR_THREADS)
 
-if [ -f "%{_javadir}/serializer.jar" ];then
+if [ -f %{_javadir}/serializer.jar ];then
 	serializer_jar=%{_javadir}/serializer.jar
 else
 	serializer_jar=%{_javadir}/xalan.jar
@@ -4139,6 +4140,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.775.2.59  2008-03-10 12:19:10  glen
+- use patches/hotfixes for gcc fix
+
 Revision 1.775.2.58  2008-03-09 18:31:35  glen
 - for ac gcc compatible, and it seems it's still xulrunner
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.775.2.58&r2=1.775.2.59&f=u