Author: baggins Date: Sun Jan 22 12:15:18 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - apply 64bit fixes on x8664
---- Files affected: SPECS: openoffice.org.spec (1.581 -> 1.582) ---- Diffs: ================================================================ Index: SPECS/openoffice.org.spec diff -u SPECS/openoffice.org.spec:1.581 SPECS/openoffice.org.spec:1.582 --- SPECS/openoffice.org.spec:1.581 Sun Jan 22 12:50:13 2006 +++ SPECS/openoffice.org.spec Sun Jan 22 13:15:13 2006 @@ -82,7 +82,7 @@ Source51: openintro_pld.bmp Patch0: %{name}-STL-lib64.diff -Patch1: buildfix-64bit-sc.diff +Patch1: %{name}-64bit-inline.diff Patch2: %{name}-desktop.patch Patch3: %{name}-gcc4.diff Patch4: ooo-build-update.patch @@ -144,6 +144,7 @@ BuildRequires: rpmbuild(macros) >= 1.213 BuildRequires: sablotron-devel BuildRequires: sane-backends-devel +BuildRequires: sed >= 4.0 BuildRequires: startup-notification-devel >= 0.5 BuildRequires: tcsh BuildRequires: unixODBC-devel @@ -1744,8 +1745,14 @@ %{SOURCE14} src # add to ooo-build patch-system -install %{PATCH0} patches/src680 +%ifarch %{x8664} sparc64 +install %{PATCH0} patches/64bit install %{PATCH1} patches/64bit +echo "[ 64bitPLDFixes ]" >>patches/src680/apply +echo `basename %{PATCH0}` >>patches/src680/apply +echo `basename %{PATCH1}` >>patches/src680/apply +sed -i -e 's/PLD64: PLDBase, 64bit/PLD64: PLDBase, 64bit, 64bitPLDFixes/' patches/src680/apply +%endif %if %{with gcc4} install %{PATCH3} patches/src680 (echo "[ Fixes ]"; echo `basename %{PATCH3}`) >>patches/src680/apply @@ -2277,6 +2284,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.582 2006/01/22 12:15:13 baggins +- apply 64bit fixes on x8664 + Revision 1.581 2006/01/22 11:50:13 arekm Drop obsolete files; package more files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.581&r2=1.582&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit