[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.113.ooo51385.bridges.stack.patch, NONE, 1.1 openoffice.org.spec, 1.265, 1.266 sources, 1.83, 1.84



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24180

Modified Files:
	openoffice.org.spec sources 
Added Files:
	openoffice.org-1.9.113.ooo51385.bridges.stack.patch 
Log Message:
new bulgarian help documentation

openoffice.org-1.9.113.ooo51385.bridges.stack.patch:
 bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk |    2 +-
 source/cpp_uno/gcc3_linux_intel/makefile.mk         |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.113.ooo51385.bridges.stack.patch ---
Index: source/cpp_uno/gcc3_linux_intel/makefile.mk
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk	6 Jun 2005 17:32:07 -0000	1.5
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk	1 Jul 2005 12:33:48 -0000
@@ -110,5 +110,5 @@
 .INCLUDE :  target.mk
 
 $(SLO)$/%.obj: %.s
-    $(CC) -Wa,--noexecstack -c -o $(SLO)$/$(@:b).o $<
+    $(CC) -c -o $(SLO)$/$(@:b).o $<
     touch $@


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- openoffice.org.spec	1 Jul 2005 08:23:30 -0000	1.265
+++ openoffice.org.spec	1 Jul 2005 12:55:40 -0000	1.266
@@ -107,6 +107,7 @@
 Patch44: openoffice.org-1.9.112.oooXXXXX.testtools.patch
 Patch45: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
 Patch46: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
+Patch47: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -732,6 +733,7 @@
 %patch44 -p1 -b .oooXXXXX.testtools.patch
 %patch45 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
 %patch46 -p1 -b .ooo43430.cvskk.np_sdk.patch
+%patch47 -p1 -b .ooo51385.bridges.stack.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped
@@ -878,7 +880,7 @@
 #disabled for now until system-db is done
 #if [ $origin == 1 ]; then false; fi
 #if [ $pic == 1 ]; then false; fi
-if [ $executable == 1 ]; then false; fi
+#if [ $executable == 1 ]; then false; fi
 
 #make up some /usr/bin scripts
 cp %{SOURCE4} $RPM_BUILD_ROOT/%{instdir}/program/crash_report
@@ -986,6 +988,7 @@
 %defattr(-,root,root)
 %dir %{instdir}
 %dir %{instdir}/share
+%{instdir}/help/bg
 %{instdir}/program/resource/*680bg.res
 %dir %{instdir}/share/dict
 %dir %{instdir}/share/dict/ooo


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	30 Jun 2005 13:33:31 -0000	1.83
+++ sources	1 Jul 2005 12:55:41 -0000	1.84
@@ -2,4 +2,4 @@
 176aa81d51a6ed28c5e9a14696a8d208  openoffice.org-jakubicons.tar.gz
 6b3bd4b8eb31dd067d4cb2dcc1ba5e12  openoffice.org-myspell-contrib.tar.gz
 11c0541fa373a327d1c134887ce511e7  openoffice.org-simple-crash_report.sh
-f48331f5541da8264f48d96ef1be6e84  SRC680_m113.tar.bz2
+5cab3abae4f8541facdc9f51c261c1af  SRC680_m113.tar.bz2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]