rpms/writer2latex/devel writer2latex.spec, 1.5, 1.6 writer2latex05.rh.patch, 1.1, 1.2

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/writer2latex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12173

Modified Files:
	writer2latex.spec writer2latex05.rh.patch 
Log Message:
build against 3 layer OOo


Index: writer2latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- writer2latex.spec	26 Mar 2008 15:55:34 -0000	1.5
+++ writer2latex.spec	31 May 2008 13:09:21 -0000	1.6
@@ -140,8 +140,9 @@
 %{_datadir}/openoffice.org/extensions/writer2latex.uno.pkg
 
 %changelog
-* Wed Mar 26 2008 Caolan McNamara <caolanm at redhat.com> 0.5-3
+* Sat Mar 31 2008 Caolan McNamara <caolanm at redhat.com> 0.5-3
 - tweak for guidelines
+- and adjust for OOo3 3 layer packaging
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5-2
 - Autorebuild for GCC 4.3

writer2latex05.rh.patch:

Index: writer2latex05.rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex05.rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- writer2latex05.rh.patch	1 Dec 2007 20:22:38 -0000	1.1
+++ writer2latex05.rh.patch	31 May 2008 13:09:21 -0000	1.2
@@ -1,15 +1,19 @@
 diff -ru writer2latex05.orig/build.xml writer2latex05/build.xml
 --- writer2latex05.orig/build.xml	2006-11-02 10:15:42.000000000 +0000
 +++ writer2latex05/build.xml	2007-11-16 08:47:53.000000000 +0000
-@@ -8,7 +8,7 @@
- <project name="w2l" default="help" basedir=".">
- 
-     <!-- set this property to the location of your SO/OOo installation -->
--	<property name="OFFICE_HOME" location=""/>
-+        <property name="OFFICE_HOME" location="LIBDIR/openoffice.org"/>
- 
-     <description>writer2latex - build file</description>
+@@ -40,8 +40,10 @@
+     <property name="target.lib" location="target/lib"/>
+     <!-- classpath for the application; needs java-uno classes -->
+     <path id="main.class.path"> 
+-        <filelist dir="${OFFICE_HOME}/program/classes"
+-            files="jurt.jar,unoil.jar,ridl.jar,juh.jar"/>
++        <filelist dir="LIBDIR/openoffice.org/ure/share/java"
++            files="jurt.jar,ridl.jar,juh.jar"/>
++        <filelist dir="LIBDIR/openoffice.org/basis3.0/program/classes"
++            files="unoil.jar"/>
+     </path> 
  
+     <target name="all"
 diff -ru writer2latex05.orig/source/writer2latex/office/ImageLoader.java writer2latex05/source/writer2latex/office/ImageLoader.java
 --- writer2latex05.orig/source/writer2latex/office/ImageLoader.java	2007-04-17 08:30:42.000000000 +0100
 +++ writer2latex05/source/writer2latex/office/ImageLoader.java	2007-11-16 09:01:16.000000000 +0000