From 02f6f2de024731ac328cb8b7ba52716b73458bc8 Mon Sep 17 00:00:00 2001 From: Matt Wringe Date: Jul 19 2006 19:10:39 +0000 Subject: Added conditional native compiling. --- diff --git a/avalon-framework.spec b/avalon-framework.spec index dd1643c..57dea71 100644 --- a/avalon-framework.spec +++ b/avalon-framework.spec @@ -1,8 +1,11 @@ +%define _with_gcj_support 1 + +%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} %define short_name framework %define short_Name Avalon %define name avalon-%{short_name} %define version 4.1.4 -%define release 2jpp_9fc +%define release 2jpp_10fc %define section free Name: %{name} @@ -13,8 +16,6 @@ Summary: Java components interfaces License: Apache Software License Url: http://avalon.apache.org/%{short_name}/ Group: Development/Libraries/Application Frameworks -#Vendor: JPackage Project -#Distribution: JPackage Source0: http://www.apache.org/dist/avalon/framework/v4.1.4/Avalon-4.1.4-src.tar.gz Patch1: %{name}-target.patch Requires: xml-commons-apis @@ -24,9 +25,17 @@ BuildRequires: junit BuildRequires: avalon-logkit BuildRequires: xml-commons-apis BuildRequires: jpackage-utils >= 0:1.5 +%if ! %{gcj_support} BuildArch: noarch +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif + %description The Avalon framework consists of interfaces that define relationships between commonly used application components, best-of-practice pattern @@ -72,6 +81,10 @@ cp -pr target/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} # create unversioned symlinks (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) +%if %{gcj_support} +%{_bindir}/aot-compile-rpm +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -84,11 +97,31 @@ if [ "$1" = "0" ]; then rm -f %{_javadocdir}/%{name} fi +%post +%if %{gcj_support} +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%postun +%if %{gcj_support} +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + %files %defattr(0644,root,root,0755) %doc KEYS LICENSE.txt README.txt %{_javadir}/*.jar +%if %{gcj_support} +%attr(-,root,root) %{_libdir}/gcj/%{name}/avalon-framework-4.1.4.jar.* +%endif + %files manual %defattr(0644,root,root,0755) %doc docs/* @@ -98,6 +131,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Wed Jul 19 2006 Matt Wringe - 0:4.1.4-2jpp_10fc +- Added conditional native compling. + * Thu Jun 8 2006 Deepak Bhole - 0:4.1.4-2jpp_9fc - Updated description for fix to Bug# 170999