rpms/writer2latex/devel writer2latex.spec,1.24,1.25

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/writer2latex/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18114

Modified Files:
	writer2latex.spec 
Log Message:
rebuild for 3.3


Index: writer2latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- writer2latex.spec	8 Jul 2010 08:37:44 -0000	1.24
+++ writer2latex.spec	14 Jul 2010 14:57:48 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:          writer2latex
 Version:       1.0.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Document Converter from ODT to LaTeX
 License:       LGPLv2
 Url:           http://writer2latex.sourceforge.net/
@@ -17,10 +17,10 @@ Requires:      jaxp_parser_impl, jaxp_tr
 BuildRequires: java-gcj-compat-devel >= 1.0.31
 Requires(post): java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
-%else
-BuildArch: noarch
 %endif
 
+%define baseinstdir %{_libdir}/openoffice.org
+
 %description
 Writer2LaTeX is a utility written in java. It converts OpenOffice.org documents
 – in particular documents containing formulas – into other formats. It is
@@ -38,7 +38,7 @@ actually a collection of four converters
 Summary:     Javadoc for %{name}
 Group:       Development/Documentation
 %if %{with_gcj}
-BuildArch: noarch
+BuildArch:    noarch
 %endif
 
 %description javadoc
@@ -73,7 +73,7 @@ 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.2/program/classes"#' build.xml
+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
 
 %build
@@ -92,10 +92,10 @@ pushd $RPM_BUILD_ROOT%{_javadocdir}
 ln -s %{name}-%{version} %{name}
 popd
 # OOo extensions
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/writer2latex.oxt
-unzip target/lib/writer2latex.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/writer2latex.oxt
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/writer2xhtml.oxt
-unzip target/lib/writer2xhtml.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/writer2xhtml.oxt
+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
 %if %{with_gcj}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -128,40 +128,12 @@ if [ $1 -gt 1 ]; then
     unopkg remove --shared org.openoffice.da.writer2latex.oxt > /dev/null 2>&1 || :
 fi
 
-%post -n openoffice.org-writer2latex
-    # register extension
-    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/writer2latex.oxt || :
-
-%preun -n openoffice.org-writer2latex
-if [ $1 -eq 0 ]; then
-    # not upgrading => deregister
-    unopkg remove --shared org.openoffice.da.writer2latex.oxt || :
-fi
-
-%postun -n openoffice.org-writer2latex
-    # clear disk cache
-    unopkg list --shared > /dev/null 2>&1 || :
-
 %pre -n openoffice.org-writer2xhtml
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
     unopkg remove --shared org.openoffice.da.writer2xhtml.oxt || :
 fi
 
-%post -n openoffice.org-writer2xhtml
-    # register extension
-    unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/writer2xhtml.oxt || :
-
-%preun -n openoffice.org-writer2xhtml
-if [ $1 -eq 0 ]; then
-    # not upgrading => deregister
-    unopkg remove --shared org.openoffice.da.writer2xhtml.oxt || :
-fi
-
-%postun -n openoffice.org-writer2xhtml
-    # clear disk cache
-    unopkg list --shared > /dev/null 2>&1 || :
-
 %files
 %defattr(0644,root,root,0755)
 %doc source/distro/History.txt source/distro/COPYING.TXT source/distro/Readme.txt source/distro/doc/user-manual.odt
@@ -179,14 +151,17 @@ fi
 %files -n openoffice.org-writer2latex
 %defattr(0644,root,root,0755)
 %doc source/distro/COPYING.TXT
-%{_datadir}/openoffice.org/extensions/writer2latex.oxt
+%{baseinstdir}/extensions/writer2latex.oxt
 
 %files -n openoffice.org-writer2xhtml
 %defattr(0644,root,root,0755)
 %doc source/distro/COPYING.TXT
-%{_datadir}/openoffice.org/extensions/writer2xhtml.oxt
+%{baseinstdir}/extensions/writer2xhtml.oxt
 
 %changelog
+* Wed Jul 14 2010 Caolán McNamara <caolanm at redhat.com> 1.0.2-3
+- rebuild for OpenOffice.org 3.3
+
 * Thu Jul 08 2010 Caolán McNamara <caolanm at redhat.com> 1.0.2-2
 - add COPYING to all subpackages