diff --git a/pentaho-reporting-flow-engine.spec b/pentaho-reporting-flow-engine.spec index c6538e5..a729b1d 100644 --- a/pentaho-reporting-flow-engine.spec +++ b/pentaho-reporting-flow-engine.spec @@ -1,9 +1,6 @@ -# Use rpmbuild --without gcj to disable native bits -%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} - Name: pentaho-reporting-flow-engine Version: 0.9.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Pentaho Flow Reporting Engine License: LGPLv2+ Epoch: 1 @@ -17,13 +14,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: java, jpackage-utils, libbase >= 1.1.3, libfonts >= 1.1.3 Requires: pentaho-libxml, libformula >= 1.1.3, librepository >= 1.1.3 Requires: sac, flute, liblayout >= 0.2.10, libserializer -%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 Pentaho Reporting Flow Engine is a free Java report library, formerly @@ -34,9 +25,6 @@ Summary: Javadoc for %{name} Group: Development/Documentation Requires: %{name} = 1:%{version}-%{release} Requires: jpackage-utils -%if %{with_gcj} -BuildArch: noarch -%endif %description javadoc Javadoc for %{name}. @@ -60,42 +48,23 @@ cp -p build/lib/flow-engine.jar $RPM_BUILD_ROOT%{_javadir}/flow-engine.jar mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -rp build/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} -%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 licence-LGPL.txt README.txt ChangeLog.txt %{_javadir}/*.jar -%if %{with_gcj} -%attr(-,root,root) %{_libdir}/gcj/%{name} -%endif %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name} %changelog +* Fri Oct 28 2011 Caolán McNamara 1:0.9.4-4 +- Related: rhbz#749103 drop gcj aot + * Tue Feb 08 2011 Fedora Release Engineering - 1:0.9.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild