[writer2latex] Resolves: rhbz#1022169 remove versioned jars

[Caolán McNamara]

commit 7042c0f6d8daea5a11f3128c2a81d6859439c334
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 23 10:36:01 2013 +0100

    Resolves: rhbz#1022169 remove versioned jars

 writer2latex.spec |   46 ++++++++--------------------------------------
 1 files changed, 8 insertions(+), 38 deletions(-)
---
diff --git a/writer2latex.spec b/writer2latex.spec
index 62b70fc..e0c5e5e 100644
--- a/writer2latex.spec
+++ b/writer2latex.spec
@@ -1,9 +1,6 @@
-# Use rpmbuild --without gcj to disable native bits
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
 Name:          writer2latex
 Version:       1.0.2
-Release:       11%{?dist}
+Release:       12%{?dist}
 Summary:       Document Converter from ODT to LaTeX
 License:       LGPLv2
 Url:           http://writer2latex.sourceforge.net/
@@ -18,11 +15,6 @@ 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
-%if %{with_gcj}
-BuildRequires: java-gcj-compat-devel >= 1.0.31
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
 
 %define baseinstdir %{_libdir}/libreoffice
 
@@ -42,9 +34,7 @@ actually a collection of four converters, i.e.:
 %package javadoc
 Summary:     Javadoc for %{name}
 Group:       Development/Documentation
-%if %{with_gcj}
-BuildArch:    noarch
-%endif
+BuildArch:   noarch
 
 %description javadoc
 Javadoc for %{name}.
@@ -84,8 +74,7 @@ ant jar javadoc oxt
 rm -rf $RPM_BUILD_ROOT
 # jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done)
+install -p -m 644 target/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -p -r target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -97,36 +86,14 @@ install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/writer2latex.ox
 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %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
 %{_javadir}/*
-%if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -145,6 +112,9 @@ fi
 %{baseinstdir}/share/extensions/writer2xhtml.oxt
 
 %changelog
+* Wed Oct 23 2013 Caolán McNamara <caolanm at redhat.com> - 1.0.2-12
+- Resolves: rhbz#1022169 remove versioned jars
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -214,12 +184,12 @@ fi
 * Sat Aug 09 2008 Caolán McNamara <caolanm at redhat.com> 0.5-4
 - use generic requires
 
-* Sat Mar 31 2008 Caolán McNamara <caolanm at redhat.com> 0.5-3
+* Mon Mar 31 2008 Caolán 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
 
-* Sun Dec 1 2007 Caolán McNamara <caolanm at redhat.com> 0.5-1
+* Sat Dec 1 2007 Caolán McNamara <caolanm at redhat.com> 0.5-1
 - initial version