SPECS (DEVEL): openoffice.org.spec - patch107 needed on x86_64

[arekm]

Author: arekm                        Date: Fri Oct 19 07:29:47 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- patch107 needed on x86_64

---- Files affected:
SPECS:
   openoffice.org.spec (1.775.2.13 -> 1.775.2.14) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.775.2.13 SPECS/openoffice.org.spec:1.775.2.14
--- SPECS/openoffice.org.spec:1.775.2.13	Fri Oct 19 08:24:35 2007
+++ SPECS/openoffice.org.spec	Fri Oct 19 09:29:42 2007
@@ -2085,7 +2085,8 @@
 %setup -q -n ooo-build-trunk
 install -d src
 
-# sources, icons, KDE_icons
+# sources, icons, KDE_icons. You can verify that all needed sources
+# are here by running ./download script manually after rpmbuild -bp
 ln -sf %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
 	%{SOURCE10} %{SOURCE11} %{SOURCE12} \
 	%{SOURCE15} %{SOURCE16} %{SOURCE17} \
@@ -2109,25 +2110,14 @@
 #%patch8 -p1
 #%patch9 -p1
 
-# 64 bit related patches (not applied now)
-#install %{PATCH100} patches/64bit
-#install %{PATCH101} patches/64bit/64bit-inline.diff
-
-#%ifarch %{x8664}
-#echo "[ PLD64bitfixes ]" >> patches/src680/apply
-## patches applied by ooo (extension .diff is required)
-#for P in %{PATCH107}; do
-#	PATCHNAME=PLD-${P##*/%{name}-}
-#	PATCHNAME=${PATCHNAME%.patch}.diff
-#	install $P patches/src680/$PATCHNAME
-#	echo $PATCHNAME >> patches/src680/apply
-#done
-#%endif
-
 echo "[ PLDOnly ]" >> patches/src680/apply
 # patches applied by ooo (extension .diff is required)
 #for P in %{PATCH102} %{PATCH104} %{PATCH108} %{PATCH109} %{PATCH111} %{PATCH112}; do
-for P in %{PATCH108}; do
+for P in \
+%ifarch %{x8664}
+	%{PATCH107} \
+%endif
+	%{PATCH108}; do
 	PATCHNAME=PLD-${P##*/%{name}-}
 	PATCHNAME=${PATCHNAME%.patch}.diff
 	install $P patches/src680/$PATCHNAME
@@ -4102,6 +4092,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.775.2.14  2007/10/19 07:29:42  arekm
+- patch107 needed on x86_64
+
 Revision 1.775.2.13  2007/10/19 06:24:35  arekm
 - new snap; stlport5 detection fails on x86_64
 
================================================================

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