[liblayout] Related: rhbz#749103 drop gcj aot

[Caolan McNamara]

commit 3b5d4dd66f74a31722a46871f99ca088f6892862
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 28 09:27:27 2011 +0100

    Related: rhbz#749103 drop gcj aot

 liblayout.spec |   39 ++++-----------------------------------
 1 files changed, 4 insertions(+), 35 deletions(-)
---
diff --git a/liblayout.spec b/liblayout.spec
index 57fe0aa..570436f 100644
--- a/liblayout.spec
+++ b/liblayout.spec
@@ -1,9 +1,6 @@
-# Use rpmbuild --without gcj to disable native bits
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
 Name: liblayout
 Version: 0.2.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: CSS based layouting framework
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -15,13 +12,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: java, jpackage-utils, flute, libloader >= 1.1.3
 Requires: librepository >= 1.1.3, libfonts >= 1.1.3, sac, xml-commons-apis
 Requires: pentaho-libxml, libbase >= 1.0.0
-%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
 LibLayout is a layouting framework. It is based on the Cascading StyleSheets
@@ -33,9 +24,6 @@ Summary: Javadoc for %{name}
 Group: Development/Documentation
 Requires: %{name} = %{version}-%{release}
 Requires: jpackage-utils
-%if %{with_gcj}
-BuildArch: noarch
-%endif
 
 %description javadoc
 Javadoc for %{name}.
@@ -62,42 +50,23 @@ 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 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 <caolanm at redhat.com> - 0.2.10-3
+- Related: rhbz#749103 drop gcj aot
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild