diff --git a/flute.spec b/flute.spec index 181fb88..deb8c48 100644 --- a/flute.spec +++ b/flute.spec @@ -1,9 +1,6 @@ -# Use rpmbuild --without gcj to disable native bits -%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0} - Name: flute Version: 1.3.0 -Release: 6.OOo31%{?dist} +Release: 7.OOo31%{?dist} Summary: Java CSS parser using SAC # The entire source code is W3C except ParseException.java which is LGPLv2+ License: W3C and LGPLv2+ @@ -13,13 +10,7 @@ URL: http://www.w3.org/Style/CSS/SAC/ BuildRequires: ant, java-devel, jpackage-utils, sac BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: java, jpackage-utils sac -%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 A Cascading Style Sheets parser using the Simple API for CSS, for Java. @@ -27,9 +18,6 @@ A Cascading Style Sheets parser using the Simple API for CSS, for Java. %package javadoc Group: Development Documentation Summary: Javadoc for %{name} -%if %{with_gcj} -BuildArch: noarch -%endif %description javadoc Javadoc for %{name}. @@ -51,36 +39,14 @@ cp -p build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.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 COPYRIGHT.html %{_javadir}/*.jar -%if %{with_gcj} -%attr(-,root,root) %{_libdir}/gcj/%{name} -%endif %files javadoc %defattr(0644,root,root,0755) @@ -88,6 +54,9 @@ fi %{_javadocdir}/%{name} %changelog +* Fri Oct 28 2011 Caolán McNamara 1.3.0-7.OOo31 +- Related: rhbz#749103 drop gcj aot + * Tue Feb 08 2011 Fedora Release Engineering - 1.3.0-6.OOo31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild