rpms/openoffice.org/devel openoffice.org-3.0.0.oooXXXXX.filter.latex.patch, NONE, 1.1 openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch, 1.1, 1.2 openoffice.org.spec, 1.1636, 1.1637

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.oooXXXXX.filter.latex.patch 
Log Message:
add openoffice.org-3.0.0.oooXXXXX.filter.latex.patch

openoffice.org-3.0.0.oooXXXXX.filter.latex.patch:

--- NEW FILE openoffice.org-3.0.0.oooXXXXX.filter.latex.patch ---
Index: source/config/fragments/fcfg_writer.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/fcfg_writer.mk,v
retrieving revision 1.14.20.1
diff -u -r1.14.20.1 fcfg_writer.mk
--- openoffice.org.orig/filter/source/config/fragments/fcfg_writer.mk	15 Aug 2008 10:33:45 -0000	1.14.20.1
+++ openoffice.org/filter/source/config/fragments/fcfg_writer.mk	3 Sep 2008 14:16:49 -0000
@@ -29,9 +29,13 @@
     writer_MS_Word_2003_XML \
 	writer_MS_Word_2007_XML \
 	writer_MS_Word_2007_XML_Template \
-    MediaWiki_File \
+    MediaWiki_File
+
+.IF "$(WITH_WRITER2LATEX)" != "NO"
+T4_WRITER += \
 	LaTeX \
 	BibTeX
+.ENDIF
 
 # -----------------------------------------------
 # count = 39
@@ -63,9 +67,13 @@
     writer_web_MediaWiki_File \
     MS_Word_2003_XML \
 	MS_Word_2007_XML \
-	MS_Word_2007_XML_Template \
+	MS_Word_2007_XML_Template
+
+.IF "$(WITH_WRITER2LATEX)" != "NO"
+F4_WRITER += \
 	LaTeX_Writer \
 	BibTeX_Writer
+.ENDIF
 
 # -----------------------------------------------
 # count = 14

openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch:

Index: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch	3 Sep 2008 10:11:35 -0000	1.1
+++ openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch	3 Sep 2008 14:18:41 -0000	1.2
@@ -3,8 +3,8 @@
 RCS file: /cvs/graphics/svx/inc/svx/AccessibleContextBase.hxx,v
 retrieving revision 1.4
 diff -u -r1.4 AccessibleContextBase.hxx
---- inc/svx/AccessibleContextBase.hxx	7 Jul 2008 14:27:26 -0000	1.4
-+++ inc/svx/AccessibleContextBase.hxx	3 Sep 2008 10:01:10 -0000
+--- openoffice.org.orig/svx/inc/svx/AccessibleContextBase.hxx	7 Jul 2008 14:27:26 -0000	1.4
++++ openoffice.org/svx/inc/svx/AccessibleContextBase.hxx	3 Sep 2008 10:01:10 -0000
 @@ -396,6 +396,15 @@
  	*/
  	void SetAccessibleRole( sal_Int16 _nRole );
@@ -26,8 +26,8 @@
 RCS file: /cvs/graphics/svx/inc/svx/AccessibleShape.hxx,v
 retrieving revision 1.4
 diff -u -r1.4 AccessibleShape.hxx
---- inc/svx/AccessibleShape.hxx	7 Jul 2008 14:28:01 -0000	1.4
-+++ inc/svx/AccessibleShape.hxx	3 Sep 2008 10:01:11 -0000
+--- openoffice.org.orig/svx/inc/svx/AccessibleShape.hxx	7 Jul 2008 14:28:01 -0000	1.4
++++ openoffice.org/svx/inc/svx/AccessibleShape.hxx	3 Sep 2008 10:01:11 -0000
 @@ -437,6 +437,8 @@
          AccessibleContextBase base class.
      */
@@ -42,8 +42,8 @@
 RCS file: /cvs/graphics/svx/source/accessibility/AccessibleContextBase.cxx,v
 retrieving revision 1.28
 diff -u -r1.28 AccessibleContextBase.cxx
---- source/accessibility/AccessibleContextBase.cxx	7 Jul 2008 14:28:50 -0000	1.28
-+++ source/accessibility/AccessibleContextBase.cxx	3 Sep 2008 10:02:17 -0000
+--- openoffice.org.orig/svx/source/accessibility/AccessibleContextBase.cxx	7 Jul 2008 14:28:50 -0000	1.28
++++ openoffice.org/svx/source/accessibility/AccessibleContextBase.cxx	3 Sep 2008 10:02:17 -0000
 @@ -587,6 +587,13 @@
  }
  
@@ -98,8 +98,8 @@
 RCS file: /cvs/graphics/svx/source/accessibility/AccessibleShape.cxx,v
 retrieving revision 1.54
 diff -u -r1.54 AccessibleShape.cxx
---- source/accessibility/AccessibleShape.cxx	7 Jul 2008 14:31:23 -0000	1.54
-+++ source/accessibility/AccessibleShape.cxx	3 Sep 2008 10:02:17 -0000
+--- openoffice.org.orig/svx/source/accessibility/AccessibleShape.cxx	7 Jul 2008 14:31:23 -0000	1.54
++++ openoffice.org/svx/source/accessibility/AccessibleShape.cxx	3 Sep 2008 10:02:17 -0000
 @@ -123,7 +123,7 @@
        mpParent (rShapeInfo.mpChildrenManager)
  {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1636
retrieving revision 1.1637
diff -u -r1.1636 -r1.1637
--- openoffice.org.spec	3 Sep 2008 10:11:35 -0000	1.1636
+++ openoffice.org.spec	3 Sep 2008 14:18:41 -0000	1.1637
@@ -111,6 +111,7 @@
 Patch41: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
 Patch42: openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
 Patch43: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
+Patch44: openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1293,6 +1294,7 @@
 %patch41 -p1 -b .ooo91924.svx.consistentordering.patch
 %patch42 -p1 -b .ooo93366.fpicker_in_main.patch
 %patch43 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
+%patch44 -p1 -b .oooXXXXX.filter.latex.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3653,6 +3655,7 @@
 - Resolves: rhbz#460883 openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
 - defuzz patches
 - add openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
+- add openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
 
 * Fri Aug 29 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-4.1
 - next milestone