rpms/writer2latex/devel .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 writer2latex.spec, 1.17, 1.18 writer2latex05.rh.patch, 1.4, 1.5
Caolan McNamara
caolanm at fedoraproject.org
Mon Sep 21 10:20:41 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/writer2latex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28683
Modified Files:
.cvsignore sources writer2latex.spec writer2latex05.rh.patch
Log Message:
latest version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 3 Sep 2008 12:26:28 -0000 1.4
+++ .cvsignore 21 Sep 2009 10:20:37 -0000 1.5
@@ -1 +1 @@
-writer2latex0502.zip
+1.0.tar.gz?view=tar
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 20 Nov 2008 09:22:05 -0000 1.5
+++ sources 21 Sep 2009 10:20:37 -0000 1.6
@@ -1 +1 @@
-bfcac4a3f6a564bd644d103d2e81b9d8 writer2latex0502.zip
+200fba117b58740cbf93e8fa01cafc04 1.0.tar.gz?view=tar
Index: writer2latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- writer2latex.spec 24 Jul 2009 10:18:51 -0000 1.17
+++ writer2latex.spec 21 Sep 2009 10:20:37 -0000 1.18
@@ -2,12 +2,12 @@
%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
Name: writer2latex
-Version: 0.5.0.2
-Release: 7%{?dist}
+Version: 1.0
+Release: 1%{?dist}
Summary: Document Converter from ODT to LaTeX
License: LGPLv2
-Url: http://www.hj-gym.dk/~hj/writer2latex/
-Source0: http://www.hj-gym.dk/~hj/writer2latex/writer2latex0502.zip
+Url: http://writer2latex.sourceforge.net/
+Source0: http://writer2latex.svn.sourceforge.net/viewvc/writer2latex/tags/1.0.tar.gz?view=tar
Patch0: writer2latex05.rh.patch
BuildRequires: ant, openoffice.org-core
Group: Text Processing/Markup/XML
@@ -71,9 +71,10 @@ Document Converter Extension for OpenOff
XHTML export filters.
%prep
-%setup -q -n writer2latex05
+%setup -q -n 1.0
%patch0 -p1 -b .rh.patch
-sed -i -e "s#LIBDIR#%{_libdir}#" build.xml
+sed -i -e "s#/opt/openoffice.org/basis3.0#%{_libdir}/openoffice.org/basis3.1#" build.xml
+sed -i -e "s#/opt/openoffice.org/ure#%{_libdir}/openoffice.org/ure#" build.xml
%build
ant jar javadoc oxt
@@ -163,7 +164,7 @@ fi
%files
%defattr(0644,root,root,0755)
-%doc COPYING.TXT Readme.txt History.txt
+%doc source/distro/History.txt source/distro/COPYING.TXT source/distro/Readme.txt source/distro/doc/user-manual.odt
%{_javadir}/*
%if %{with_gcj}
%attr(-,root,root) %{_libdir}/gcj/%{name}
@@ -183,6 +184,9 @@ fi
%{_datadir}/openoffice.org/extensions/writer2xhtml.oxt
%changelog
+* Mon Sep 21 2009 Caolan McNamara <caolanm at redhat.com> 1.0-1
+- latest version
+
* Fri Jul 24 2009 Caolan McNamara <caolanm at redhat.com> 0.5.0.2-7
- make javadoc no-arch when building as arch-dependant aot
writer2latex05.rh.patch:
build.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: writer2latex05.rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex05.rh.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- writer2latex05.rh.patch 26 Feb 2009 11:12:32 -0000 1.4
+++ writer2latex05.rh.patch 21 Sep 2009 10:20:37 -0000 1.5
@@ -1,33 +1,6 @@
-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
-@@ -107,8 +107,8 @@
- }
- // TODO: Use another base64 decoder. This one is "nonstandard"
- try {
-- blob = new sun.misc.BASE64Decoder().decodeBuffer(buf.toString());
-- } catch (IOException e) {
-+ blob = org.apache.xerces.impl.dv.util.Base64.decode(buf.toString());
-+ } catch (Exception e) {
- System.err.println("Oops - error converting base64");
- }
- sMIME = MIMETypes.getMagicMIMEType(blob);
--- writer2latex05.orig/build.xml 2007-11-16 11:19:54.000000000 +0000
+++ writer2latex05/build.xml 2007-11-16 11:30:50.000000000 +0000
-@@ -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.1/program/classes"
-+ files="unoil.jar"/>
- </path>
-
- <target name="all"
-@@ -84,7 +86,7 @@
+@@ -100,7 +100,7 @@
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Main-Class" value="writer2latex.Application"/>
@@ -36,19 +9,19 @@ diff -ru writer2latex05.orig/source/writ
</manifest>
</jar>
</target>
-@@ -115,7 +117,7 @@
+@@ -135,7 +135,7 @@
<attribute name="Built-By" value="${user.name}"/>
<!-- OOo needs this to register the filter: -->
- <attribute name="RegistrationClassName" value="writer2latex.filter.W2LExportFilter" />
+ <attribute name="RegistrationClassName" value="org.openoffice.da.comp.writer2latex.W2LRegistration" />
- <attribute name="Class-Path" value="jaxp.jar parser.jar"/>
+ <attribute name="Class-Path" value="jaxp.jar jaxp_parser_impl.jar"/>
</manifest>
</jar>
-@@ -150,7 +152,7 @@
+@@ -174,7 +174,7 @@
<attribute name="Built-By" value="${user.name}"/>
<!-- OOo needs this to register the filter: -->
- <attribute name="RegistrationClassName" value="writer2latex.filter.W2XExportFilter" />
+ <attribute name="RegistrationClassName" value="org.openoffice.da.comp.writer2xhtml.W2XRegistration" />
- <attribute name="Class-Path" value="jaxp.jar parser.jar"/>
+ <attribute name="Class-Path" value="jaxp.jar jaxp_parser_impl.jar"/>
</manifest>
More information about the scm-commits
mailing list