rpms/brazil/F-11 brazil.spec,1.2,1.3

[mbooth]

Author: mbooth

Update of /cvs/pkgs/rpms/brazil/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15259/brazil/F-11

Modified Files:
	brazil.spec 
Log Message:
* Sat Jun 27 2009 Mat Booth <fedora at matbooth.co.uk> 2.3-5
- Drop support for GCJ ahead of time compilation.



Index: brazil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brazil/F-11/brazil.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- brazil.spec	24 Feb 2009 05:48:09 -0000	1.2
+++ brazil.spec	27 Jun 2009 12:43:04 -0000	1.3
@@ -1,5 +1,3 @@
-%define gcj_support 1
-
 Name:      brazil
 Version:   2.3
 Release:   4%{?dist}
@@ -22,14 +20,8 @@ Patch0:    brazil-remove-proprietary-sun
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:    gcc-java
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%else
 BuildArch:        noarch
-%endif
+
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    ant
@@ -91,26 +83,14 @@ cp -pr build/javadoc/* %{buildroot}%{_ja
 mkdir -p %{buildroot}%{_datadir}/%{name}
 cp -pr samples %{buildroot}%{_datadir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf %{buildroot}
 
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
-
 %files
 %defattr(-,root,root,-)
 %doc srcs/license.terms
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -122,6 +102,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jun 27 2009 Mat Booth <fedora at matbooth.co.uk> 2.3-5
+- Drop support for GCJ ahead of time compilation.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild