rpms/writer2latex/devel writer2latex.spec,1.16,1.17

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/writer2latex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14302

Modified Files:
	writer2latex.spec 
Log Message:
make javadoc no-arch when building as arch-dependant aot


Index: writer2latex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/writer2latex/devel/writer2latex.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- writer2latex.spec	24 Jul 2009 10:08:57 -0000	1.16
+++ writer2latex.spec	24 Jul 2009 10:18:51 -0000	1.17
@@ -1,5 +1,5 @@
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+# Use rpmbuild --without gcj to disable native bits
+%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:          writer2latex
 Version:       0.5.0.2
@@ -11,14 +11,14 @@ Source0:       http://www.hj-gym.dk/~hj/
 Patch0:        writer2latex05.rh.patch
 BuildRequires: ant, openoffice.org-core
 Group:         Text Processing/Markup/XML
-%if ! %{gcj_support}
-Buildarch:     noarch
-%endif
 Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      jaxp_parser_impl, jaxp_transform_impl
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
+%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
+%else
+BuildArch: noarch
 %endif
 
 %description
@@ -95,8 +95,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 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
-
-%if %{gcj_support}
+%if %{with_gcj}
 %{_bindir}/aot-compile-rpm
 %endif
 
@@ -104,7 +103,7 @@ unzip target/lib/writer2xhtml.oxt -d $RP
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%if %{gcj_support}
+%if %{with_gcj}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -112,7 +111,7 @@ fi
 %endif
 
 %postun
-%if %{gcj_support}
+%if %{with_gcj}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -166,7 +165,7 @@ fi
 %defattr(0644,root,root,0755)
 %doc COPYING.TXT Readme.txt History.txt
 %{_javadir}/*
-%if %{gcj_support}
+%if %{with_gcj}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif