rpms/openoffice.org/devel openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch, NONE, 1.1 openoffice.org.spec, 1.1729, 1.1730

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22875

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch 
Log Message:
Resolves: rhbz#474719 openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch

openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch:

--- NEW FILE openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch ---
diff -up OOO300_m9/config_office/configure.in.orig OOO300_m9.old3/config_office/configure.in
--- OOO300_m9/config_office/configure.in.orig	2008-12-18 10:51:57.000000000 +0100
+++ OOO300_m9/config_office/configure.in	2008-12-18 10:52:26.000000000 +0100
@@ -4320,7 +4320,11 @@ else
 fi
 AC_SUBST(XINC)
 if test "$x_libraries" = "default_x_libraries"; then
-   XLIB="/usr/lib"
+   if test "$build_cpu" != "x86_64" ; then
+      XLIB="/usr/lib"
+   else
+      XLIB="/usr/lib64"
+   fi
 else
    XLIB="$x_libraries"
 fi


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1729
retrieving revision 1.1730
diff -u -r1.1729 -r1.1730
--- openoffice.org.spec	19 Dec 2008 10:56:50 -0000	1.1729
+++ openoffice.org.spec	19 Dec 2008 11:53:14 -0000	1.1730
@@ -133,6 +133,7 @@
 Patch60: workspace.vcl97.patch
 Patch61: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
 Patch62: workspace.vcl98.patch
+Patch63: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1404,6 +1405,7 @@
 %patch60 -p1 -b .workspace.vcl97.patch
 %patch61 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
 %patch62 -p1 -b .workspace.vcl98.patch
+%patch63 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3808,6 +3810,7 @@
   openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch
   into it
 - Resolves: rhbz#477016 playing video under full-screen presentation went away
+- Resolves: rhbz#474719 openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
 
 * Thu Dec 11 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-13.2
 - Resolves: rhbz#466680 package OGLTrans 3D OpenGL slide transitions