[writer2latex] Resolves: rhbz#645906 rebuild for LibreOffice

[Caolan McNamara]

commit da06e447cb1bb09e8b0cbcdbae7185c5d3f3744c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Oct 23 20:46:44 2010 +0100

    Resolves: rhbz#645906 rebuild for LibreOffice

 writer2latex.spec |   75 +++++++++++++++++++++++++---------------------------
 1 files changed, 36 insertions(+), 39 deletions(-)
---
diff --git a/writer2latex.spec b/writer2latex.spec
index 8ce5887..22a81cb 100644
--- a/writer2latex.spec
+++ b/writer2latex.spec
@@ -3,13 +3,13 @@
 
 Name:          writer2latex
 Version:       1.0.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Document Converter from ODT to LaTeX
 License:       LGPLv2
 Url:           http://writer2latex.sourceforge.net/
 Source0:       http://writer2latex.svn.sourceforge.net/viewvc/writer2latex/tags/%{version}.tar.gz
 Patch0:        writer2latex05.rh.patch
-BuildRequires: ant, openoffice.org-core
+BuildRequires: ant, libreoffice-core
 Group:         Text Processing/Markup/XML
 Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      jaxp_parser_impl, jaxp_transform_impl
@@ -19,10 +19,10 @@ Requires(post): java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
 %endif
 
-%define baseinstdir %{_libdir}/openoffice.org
+%define baseinstdir %{_libdir}/libreoffice
 
 %description
-Writer2LaTeX is a utility written in java. It converts OpenOffice.org documents
+Writer2LaTeX is a utility written in java. It converts LibreOffice documents
 – in particular documents containing formulas – into other formats. It is
 actually a collection of four converters, i.e.:
 1) Writer2LaTeX converts documents into LaTeX 2e format for high quality
@@ -44,37 +44,31 @@ BuildArch:    noarch
 %description javadoc
 Javadoc for %{name}.
 
-%package -n openoffice.org-writer2latex
-Summary:          OpenOffice.org Writer To LateX Converter
-Group:            Applications/Productivity
-Requires:         openoffice.org-core
-Requires(pre):    openoffice.org-core
-Requires(post):   openoffice.org-core
-Requires(preun):  openoffice.org-core
-Requires(postun): openoffice.org-core
-
-%package -n openoffice.org-writer2xhtml
-Summary:          OpenOffice.org Writer to xhtml Converter
-Group:            Applications/Productivity
-Requires:         openoffice.org-core
-Requires(pre):    openoffice.org-core
-Requires(post):   openoffice.org-core
-Requires(preun):  openoffice.org-core
-Requires(postun): openoffice.org-core
-
-%description -n openoffice.org-writer2latex
-Document Converter Extension for OpenOffice.org to provide 
+%package -n libreoffice-writer2latex
+Summary:   LibreOffice Writer To LateX Converter
+Group:     Applications/Productivity
+Requires:  libreoffice-core
+Obsoletes: openoffice.org-writer2latex < 1.0.2-4
+
+%package -n libreoffice-writer2xhtml
+Summary:   LibreOffice Writer to xhtml Converter
+Group:     Applications/Productivity
+Requires:  libreoffice-core
+Obsoletes: openoffice.org-writer2xhtml < 1.0.2-4
+
+%description -n libreoffice-writer2latex
+Document Converter Extension for LibreOffice to provide 
 LaTeX and BibTeX export filters.
 
-%description -n openoffice.org-writer2xhtml
-Document Converter Extension for OpenOffice.org to provide 
+%description -n libreoffice-writer2xhtml
+Document Converter Extension for LibreOffice to provide 
 XHTML export filters.
 
 %prep
 %setup -q -n %{version}
 %patch0 -p1 -b .rh.patch
-sed -i -e 's#name="OFFICE_CLASSES" location="/usr/share/java/openoffice"#name="OFFICE_CLASSES" location="%{_libdir}/openoffice.org/basis3.3/program/classes"#' build.xml
-sed -i -e 's#name="URE_CLASSES" location="/usr/share/java/openoffice"#name="URE_CLASSES" location="%{_libdir}/openoffice.org/ure/share/java"#' build.xml
+sed -i -e 's#name="OFFICE_CLASSES" location="/usr/share/java/openoffice"#name="OFFICE_CLASSES" location="%{_libdir}/libreoffice/basis3.3/program/classes"#' build.xml
+sed -i -e 's#name="URE_CLASSES" location="/usr/share/java/openoffice"#name="URE_CLASSES" location="%{_libdir}/libreoffice/ure/share/java"#' build.xml
 
 %build
 ant jar javadoc oxt
@@ -91,11 +85,11 @@ cp -p -r target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 pushd $RPM_BUILD_ROOT%{_javadocdir}
 ln -s %{name}-%{version} %{name}
 popd
-# OOo extensions
-install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/writer2latex.oxt
-unzip target/lib/writer2latex.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/writer2latex.oxt
-install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/writer2xhtml.oxt
-unzip target/lib/writer2xhtml.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/writer2xhtml.oxt
+# LibreOffice extensions
+install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/writer2latex.oxt
+unzip target/lib/writer2latex.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/writer2latex.oxt
+install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/writer2xhtml.oxt
+unzip target/lib/writer2xhtml.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/writer2xhtml.oxt
 %if %{with_gcj}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -119,7 +113,7 @@ then
 fi
 %endif
 
-%pre -n openoffice.org-writer2latex
+%pre -n libreoffice-writer2latex
 if [ $1 -gt 1 ]; then
     # Upgrade
     # => deregister extension with old name if it exists
@@ -128,7 +122,7 @@ if [ $1 -gt 1 ]; then
     unopkg remove --shared org.openoffice.da.writer2latex.oxt > /dev/null 2>&1 || :
 fi
 
-%pre -n openoffice.org-writer2xhtml
+%pre -n libreoffice-writer2xhtml
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
     unopkg remove --shared org.openoffice.da.writer2xhtml.oxt || :
@@ -148,17 +142,20 @@ fi
 %{_javadocdir}/%{name}
 %{_javadocdir}/%{name}-%{version}
 
-%files -n openoffice.org-writer2latex
+%files -n libreoffice-writer2latex
 %defattr(0644,root,root,0755)
 %doc source/distro/COPYING.TXT
-%{baseinstdir}/extensions/writer2latex.oxt
+%{baseinstdir}/share/extensions/writer2latex.oxt
 
-%files -n openoffice.org-writer2xhtml
+%files -n libreoffice-writer2xhtml
 %defattr(0644,root,root,0755)
 %doc source/distro/COPYING.TXT
-%{baseinstdir}/extensions/writer2xhtml.oxt
+%{baseinstdir}/share/extensions/writer2xhtml.oxt
 
 %changelog
+* Sat Oct 23 2010 Caolán McNamara <caolanm at redhat.com> 1.0.2-4
+- Resolves: rhbz#645906 rebuild for LibreOffice 
+
 * Wed Jul 14 2010 Caolán McNamara <caolanm at redhat.com> 1.0.2-3
 - rebuild for OpenOffice.org 3.3