[jcommon] Related: rhbz#749103 drop gcj aot

[Caolan McNamara]

commit 9c5167d706496574839ff950002071877263229d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 28 11:32:28 2011 +0100

    Related: rhbz#749103 drop gcj aot

 jcommon.spec |   63 +++------------------------------------------------------
 1 files changed, 4 insertions(+), 59 deletions(-)
---
diff --git a/jcommon.spec b/jcommon.spec
index 0a25d2e..80b1a98 100644
--- a/jcommon.spec
+++ b/jcommon.spec
@@ -1,9 +1,6 @@
-# Use rpmbuild --without gcj to disable native bits
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
 Name: jcommon
 Version: 1.0.16
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: JFree Java utility classes
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -12,13 +9,7 @@ URL: http://www.jfree.org/jcommon
 BuildRequires: ant, java-devel, jpackage-utils
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: java, jpackage-utils
-%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
 JCommon is a collection of useful classes used by 
@@ -29,9 +20,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}.
@@ -41,10 +29,6 @@ Summary: JFree XML utility classes
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: java, jpackage-utils
-%if %{with_gcj}
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
 
 %description xml
 Optional XML utility classes.
@@ -66,66 +50,27 @@ cp -p %{name}-xml-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xml.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -rp javadoc $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
-
-%post xml
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun xml
-%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
 %{_javadir}/%{name}.jar
-%if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}.jar.*
-%endif
 
 %files xml
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-xml.jar
-%if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-xml.jar.*
-%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Oct 28 2011 Caolán McNamara <caolanm at redhat.com> 1.0.16-4
+- Related: rhbz#749103 drop gcj aot
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild