- add lib64 patch for STL

- require newer nas-devel which has fixed INT32 typedef
- note: amd64 build still fails

Changed files:
    libreoffice.spec -> 1.543

diff --git a/libreoffice.spec b/libreoffice.spec
index 985bf5da6b0280c0e233d650965f0a807f3cfdb9..9750a087e858ee6530183e9ef497913398dc6999 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -103,6 +103,7 @@ Source412:  %{cftp}/helpcontent/helpcontent_90_unix.tgz
 # Source412-md5:       9521a01c5817e87178f356762f8cdab5
 
 Patch0:                %{name}-pld.patch
+Patch1:                %{name}-STL-lib64.diff
 
 URL:           http://www.openoffice.org/
 BuildRequires: ImageMagick
@@ -141,7 +142,7 @@ BuildRequires:      libjpeg-devel
 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
@@ -169,7 +170,7 @@ Requires:   libstdc++ >= 5:3.2.1
 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
@@ -1439,7 +1440,7 @@ zuluskim.
 
 %prep
 %setup -q -n ooo-build-%{ooobver}
-#%patch0 -p1
+%patch0 -p1
 
 install -d src
 # sources, icons, KDE_icons
@@ -1454,6 +1455,9 @@ ln -sf %{SOURCE400} %{SOURCE401} %{SOURCE402} %{SOURCE403} %{SOURCE404} \
 #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
@@ -1498,6 +1502,9 @@ CONFOPTS=" \
 %endif
 %ifarch sparc sparcv9
        --with-arch=sparc \
+%endif
+%ifarch amd64
+       --with-arch=x86_64 \
 %endif
        --with-ccache-allowed \
        --with-system-gcc \