Author: glen Date: Thu Jul 28 11:43:59 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add lib64 patch for STL
- require newer nas-devel which has fixed INT32 typedef
- note: amd64 build still fails
---- Files affected:
SPECS:
openoffice.org.spec (1.542 -> 1.543)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.542 SPECS/openoffice.org.spec:1.543
--- SPECS/openoffice.org.spec:1.542 Wed Jul 27 21:51:29 2005
+++ SPECS/openoffice.org.spec Thu Jul 28 13:43:54 2005
@@ -104,6 +104,7 @@
# Source412-md5: 9521a01c5817e87178f356762f8cdab5
Patch0: %{name}-pld.patch
+Patch1: %{name}-STL-lib64.diff
URL: http://www.openoffice.org/
BuildRequires: ImageMagick
@@ -142,7 +143,7 @@
BuildRequires: nss-devel >= 1:3.10
BuildRequires: nspr-devel >= 1:4.6-0.20041030.3
BuildRequires: mozilla-devel >= 5:1.7.6-2
-BuildRequires: nas-devel
+BuildRequires: nas-devel >= 1.7-1
BuildRequires: neon-devel
BuildRequires: openldap-devel
BuildRequires: pam-devel
@@ -170,7 +171,7 @@
Requires: mktemp
Requires: sed
#Suggested: chkfontpath
-ExclusiveArch: %{ix86} ppc sparc sparcv9
+ExclusiveArch: %{ix86} ppc sparc sparcv9 amd64
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -1440,7 +1441,7 @@
%prep
%setup -q -n ooo-build-%{ooobver}
-#%patch0 -p1
+%patch0 -p1
install -d src
# sources, icons, KDE_icons
@@ -1455,6 +1456,9 @@
#ln -s %{SOURCE20} src/openabout_pld.bmp
#ln -s %{SOURCE21} src/openintro_pld.bmp
+# add to ooo-build patch-system
+install %{PATCH1} patches/src680
+
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
if [ ! -r /proc/cpuinfo ]; then
@@ -1500,6 +1504,9 @@
%ifarch sparc sparcv9
--with-arch=sparc \
%endif
+%ifarch amd64
+ --with-arch=x86_64 \
+%endif
--with-ccache-allowed \
--with-system-gcc \
--with-system-zlib \
@@ -2045,6 +2052,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.543 2005/07/28 11:43:54 glen
+- add lib64 patch for STL
+- require newer nas-devel which has fixed INT32 typedef
+- note: amd64 build still fails
+
Revision 1.542 2005/07/27 19:51:29 qboosh
- pl for Kinarwanda (following PWN)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.542&r2=1.543&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
