rpms/openoffice.org/devel openoffice.org-2.4.0.ooo85448.emptyrpath.patch, NONE, 1.1 openoffice.org.spec, 1.1399, 1.1400

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3392

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.ooo85448.emptyrpath.patch 
Log Message:
add openoffice.org-2.4.0.ooo85448.emptyrpath.patch to fix rpath for voikko extension

openoffice.org-2.4.0.ooo85448.emptyrpath.patch:

--- NEW FILE openoffice.org-2.4.0.ooo85448.emptyrpath.patch ---
Index: settings/settings.mk
===================================================================
RCS file: /cvs/api/odk/settings/settings.mk,v
retrieving revision 1.26
diff -u -r1.26 settings.mk
--- openoffice.org.orig/odk/settings/settings.mk	12 Dec 2007 13:28:13 -0000	1.26
+++ openoffice.org/odk/settings/settings.mk	21 Jan 2008 19:52:59 -0000
@@ -320,7 +320,7 @@
 
 CC_OUTPUT_SWITCH=-o
 
-LIBRARY_LINK_FLAGS=-shared -Wl,-rpath,$$ORIGIN
+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
 
 ifeq "$(PROCTYPE)" "ppc"
 LIBRARY_LINK_FLAGS+=-fPIC


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1399
retrieving revision 1.1400
diff -u -r1.1399 -r1.1400
--- openoffice.org.spec	21 Jan 2008 11:59:55 -0000	1.1399
+++ openoffice.org.spec	21 Jan 2008 20:01:11 -0000	1.1400
@@ -143,6 +143,7 @@
 Patch69: openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
 Patch70: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
 Patch71: workspace.sw24bf02.patch
+Patch72: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1100,6 +1101,7 @@
 %patch69 -p1 -b .ooo85321.vcl.pixmapleak.patch
 %patch70 -p1 -b .ooo85429.sw.a11ycrash.patch
 %patch71 -p1 -b .workspace.sw24bf02.patch
+%patch72 -p1 -b .ooo85448.emptyrpath.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2875,6 +2877,7 @@
 - fix openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch for warren
 - fix openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
 - Resolves: rhbz#428574 add workspace.sw24bf02.patch
+- Resolves: problem in rhbz#429550 openoffice.org-2.4.0.ooo85448.emptyrpath.patch
 
 * Sat Jan 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-3.2
 - Resolves: rhbz#429258 openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch