Author: glen Date: Thu Jan 4 09:05:18 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- apply stl-amd64.patch
---- Files affected:
SPECS:
openoffice.org.spec (1.647 -> 1.648)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.647 SPECS/openoffice.org.spec:1.648
--- SPECS/openoffice.org.spec:1.647 Wed Jan 3 23:59:43 2007
+++ SPECS/openoffice.org.spec Thu Jan 4 10:05:12 2007
@@ -115,6 +115,7 @@
Patch104: %{name}-portaudio_v19.diff
Patch105: %{name}-firefox.diff
Patch106: %{name}-seamonkey.diff
+Patch107: %{name}-stl-amd64.patch
URL: http://www.openoffice.org/
BuildRequires: ImageMagick
BuildRequires: STLport-devel >= 2:5.0.0
@@ -1812,9 +1813,20 @@
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} %{PATCH105} %{PATCH106} ; do
+for P in %{PATCH102} %{PATCH104} %{PATCH105} %{PATCH106}; do
PATCHNAME=`basename $P | sed "s/%{name}-//; s/.patch$/.diff/"`
install $P patches/src680/$PATCHNAME
echo $PATCHNAME >> patches/src680/apply
@@ -1982,6 +1994,7 @@
:> distro-configs/Common.conf
:> distro-configs/Common.conf.in
echo "$CONFOPTS" > distro-configs/PLD.conf.in
+echo "$CONFOPTS" > distro-configs/PLD64.conf.in
# for cvs snaps
[ -x ./autogen.sh ] && ./autogen.sh $CONFOPTS
@@ -2937,6 +2950,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.648 2007/01/04 09:05:12 glen
+- apply stl-amd64.patch
+
Revision 1.647 2007/01/03 22:59:43 glen
- remove or package files
- remove executable permissions of rcfiles
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.647&r2=1.648&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
