[RPM (6.0)] [DIST generic] excalibur-1.0-0.r508111.17.jpp6

Ralph Apel <[email protected]> Fri, 31 Aug 2012 09:53:01 +0200
Newsgroups gmane.linux.jpackage.announce
Message-ID <[email protected]>
Name        : excalibur                    Relocations: (not relocatable)
Version     : 1.0                               Vendor: JPackage Project
Release     : 0.r508111.17.jpp6             Build Date: Fri 31 Aug 2012 09:29:32 AM CEST
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Development/Java              Source RPM: (none)
Size        : 1953883                          License: ASL 2.0
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://excalibur.apache.org/
Summary     : Excalibur IOC Frameworks, Containers, Components
Description :
Excalibur is a platform for component and container applications
built on key design patterns such as Inversion of Control and
Separation of Concerns available for the Java platform. You
can use Excalibur to build any number of other applications
from desktop centric Swing apps to complicated servers. The
Avalon Framework (the core of Excalibur) is often used as the
"underpinning" of a larger application or platform. Such
applications include Apache Cocoon, Apache James, and the
Keel Framework.
Excalibur is not part of the J2EE stack. While Excalibur can
be used in developing J2EE applications and even used to build
a J2EE server, the platform is not part of J2EE or a J2EE
application server. Excalibur is much simpler and does not
include many J2EE specifications out of the box. That said,
you might write a J2EE application which embeds Excalibur
(such as in a servlet) or you may embed a J2EE server in a
larger Excalibur-based container.
The Excalibur platform is the following:
* A core framework for component programming (The Avalon Framework)
* An IoC container called Fortress
* A set of container utilities called ContainerKit
* A component library called Cornerstone
When working with Excalibur you may use one or all of these.

---------------
Ralph Apel <[email protected]> 1:1.0-0.r508111.17
- (Re)add excalibur-i18n, excalibur-naming
---------------
excalibur.src: W: source-or-patch-not-bzipped excalibur-r508111-maven-compile-target.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-deprecated-pom.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-containerkit-logkit-DefaultDataSource.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-qdox.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-components-xmlutil-Saxon8ProcessorImpl.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-r508111-fortress-container-impl-02-pom_xml.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-r508111-deprecated-component-test-03-pom_xml.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-deprecated-i18n-pom.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-r508111-components-xmlutil-project-xml.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-r508111-fortress-examples-04-pom_xml.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-r508111-00-pom_xml.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-r508111-fortress-platform-06-wrapper_conf.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-r508111-fortress-platform-05-script.patch
excalibur.src: W: source-or-patch-not-bzipped excalibur-components-xmlutil-pom.patch
excalibur.src: W: non-standard-group Development/Java
excalibur.src: W: no-signature
excalibur.src: W: name-repeated-in-summary Excalibur
excalibur.src: W: invalid-license ASL 2.0
1 packages and 0 specfiles checked; 0 errors, 18 warnings.

---------------
Index: excalibur.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/excalibur/excalibur.spec,v
retrieving revision 1.11
diff -u -r1.11 excalibur.spec
--- excalibur.spec	21 Feb 2011 17:52:01 -0000	1.11
+++ excalibur.spec	31 Aug 2012 07:53:00 -0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2008, JPackage Project
+# Copyright (c) 2000-2012, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,22 +33,19 @@
 %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
 %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
 
-%bcond_with gcj_support
-%bcond_with jdk6
 %bcond_without maven
 %bcond_without repolib
 
-%if %with gcj_support
-%define gcj_support 1
-%else
-%define gcj_support 0
-%endif
-
 %define section     free
+%define _binary_payload w9.gzdio
+%define _source_payload w9.gzdio
+%define _binary_filedigest_algorithm 1
+%define _source_filedigest_algorithm 1
 
 %define rsvn r508111
 %define rdate 15022007
 %define main_version 1.0
+%define naming_version 1.0
 %define components_version 2.2.1
 %define containerkit_version 2.2.1
 %define cornerstone_version 2.2.1
@@ -58,7 +55,7 @@
 
 Name:           excalibur
 Version:        1.0
-Release:        0.%{rsvn}.16%{?dist}
+Release:        0.%{rsvn}.17%{?dist}
 Epoch:          1
 Summary:        Excalibur IOC Frameworks, Containers, Components
 License:        ASL 2.0
@@ -70,6 +67,8 @@
 Source4:        excalibur-1.0-jpp-depmap.xml
 Source100:      excalibur-avalon-framework-component-info.xml
 Source101:      excalibur-avalon-logkit-component-info.xml
+Source102:      http://archive.apache.org/dist/avalon/excalibur/latest/excalibur-naming-1.0.zip
+Source103:      http://mirrors.ibiblio.org/maven2/excalibur-naming/excalibur-naming/1.0/excalibur-naming-1.0.pom
 # FIXME: patch out maven-gpg-plugin processing
 Patch0:         excalibur-r508111-00-pom_xml.patch
 #### # add saxon-aelfred to dependencies:
@@ -87,6 +86,8 @@
 Patch9:         excalibur-r508111-maven-compile-target.patch
 Patch10:        excalibur-r508111-components-xmlutil-project-xml.patch
 Patch11:        excalibur-qdox.patch
+Patch12:        excalibur-deprecated-pom.patch
+Patch13:        excalibur-deprecated-i18n-pom.patch
 BuildRequires:  commons-parent
 BuildRequires:  geronimo-genesis >= 0:1.1
 BuildRequires:  jpackage-utils >= 0:1.7.5
@@ -146,11 +147,7 @@
 BuildRequires:  xml-commons-resolver11
 BuildRequires:  xom
 
-%if %{gcj_support}
-BuildRequires:  java-gcj-compat-devel
-%else
 BuildArch:      noarch
-%endif
 
 Requires(post):    jpackage-utils >= 0:1.7.4
 Requires(postun):  jpackage-utils >= 0:1.7.4
@@ -420,6 +417,24 @@
 %description cornerstone-threads-impl
 %{summary}.
 
+%package naming
+Summary:        Excalibur Naming Component (deprecated)
+Group:          Development/Libraries
+Version:        %{naming_version}
+Requires:       %{name} = %{epoch}:%{main_version}-%{release}
+
+%description naming
+%{summary}.
+
+%package i18n
+Summary:        Excalibur i18n Component (deprecated)
+Group:          Development/Libraries
+Version:        %{excalidep_version}
+Requires:       %{name} = %{epoch}:%{main_version}-%{release}
+
+%description i18n
+%{summary}.
+
 %package component
 Summary:        Excalibur Component Component (deprecated)
 Group:          Development/Libraries
@@ -1265,6 +1280,7 @@
 %setup -q -n %{name}-src-%{rsvn}-%{rdate}
 %setup -q -n %{name}-src-%{rsvn}-%{rdate} -T -D -a 2
 cp -p %{SOURCE3} settings.xml
+unzip -qq %{SOURCE102}
 find . -name "*.jar" | xargs -t rm
 
 rm components/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon6ProcessorImpl.java  
@@ -1288,13 +1304,13 @@
 %patch5 -p0 -b .sav05
 #
 %patch6 -p0 -b .sav06
-%if %with jdk6
 %patch7 -p0 -b .sav07
-%endif
 %patch8 -p0 -b .sav08
 %patch9 -p0 -b .sav09
 %patch10 -p0 -b .sav10
 %patch11 -p0 -b .sav11
+%patch12 -p0 -b .sav12
+%patch13 -p0 -b .sav13
 
 %if %with maven
 sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
@@ -1968,6 +1984,18 @@
 
 %endif
 
+pushd excalibur-naming-1.0
+mkdir src
+pushd src
+unzip -qq ../src.zip
+popd
+mkdir classes
+javac -source 1.4 -d classes $(find src -name "*.java");
+pushd classes
+jar cf ../excalibur-naming-1.0.jar *
+popd
+popd
+
 mkdir aftmp
 pushd aftmp
 jar xf ../framework/api/target/avalon-framework-api-%{framework_version}.jar
@@ -2248,6 +2276,13 @@
 
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{cornerstone_version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{cornerstone_version}||g"`; done)
 
+install -pm 644 deprecated/i18n/target/excalibur-i18n-%{excalidep_version}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}/excalibur-i18n-%{excalidep_version}.jar
+%add_to_maven_depmap org.apache.excalibur.i18n excalibur-i18n %{excalidep_version} JPP/%{name} excalibur-i18n
+%if %{with_maven}
+install -pm 644 deprecated/i18n/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-excalibur-i18n.pom
+%endif
+
 install -pm 644 deprecated/component/target/excalibur-component-%{excalidep_version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/excalibur-component-%{excalidep_version}.jar
 %add_to_maven_depmap org.apache.excalibur.component excalibur-component %{excalidep_version} JPP/%{name} excalibur-component
@@ -2353,6 +2388,15 @@
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{framework_version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{framework_version}||g"`; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{framework_version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{framework_version}||g"`; done)
 
+install -pm 644 excalibur-naming-%{naming_version}/excalibur-naming-%{naming_version}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}/excalibur-naming-%{naming_version}.jar
+%add_to_maven_depmap excalibur-naming excalibur-naming %{naming_version} JPP/%{name} excalibur-naming
+%if %{with_maven}
+install -pm 644 %{SOURCE103} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-excalibur-naming.pom
+%endif
+
+(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{naming_version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{naming_version}||g"`; done)
+
 # other poms and depmap frags
 #./components/pom.xml MISSING
 install -pm 644 components/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-excalibur-components.pom
@@ -2628,854 +2672,306 @@
 cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}/avalon-logkit-%{containerkit_version}.jar $RPM_BUILD_ROOT%{repodirlib}/logkit.jar
 %endif
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm \
-        --exclude /usr/share/java/avalon-framework-%{framework_version}.jar
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post avalon-framework
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun avalon-framework
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post avalon-framework-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun avalon-framework-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post avalon-framework-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun avalon-framework-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post avalon-logkit
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun avalon-logkit
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post cornerstone-connection-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun cornerstone-connection-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post cornerstone-datasources-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun cornerstone-datasources-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post cornerstone-datasources-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun cornerstone-datasources-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post cornerstone-scheduler-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun cornerstone-scheduler-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post cornerstone-scheduler-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun cornerstone-scheduler-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post cornerstone-sockets-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun cornerstone-sockets-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post cornerstone-sockets-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun cornerstone-sockets-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post cornerstone-store-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun cornerstone-store-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post cornerstone-store-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun cornerstone-store-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post cornerstone-threads-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun cornerstone-threads-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post cornerstone-threads-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun cornerstone-threads-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+
+%post naming
+%update_maven_depmap
+
+%postun naming
+%update_maven_depmap
+
+%post i18n
+%update_maven_depmap
+
+%postun i18n
+%update_maven_depmap
 
 %post component
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun component
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post datasource
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun datasource
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post event-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun event-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post event-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun event-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post fortress-bean
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun fortress-bean
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post fortress-container-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun fortress-container-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post fortress-container-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun fortress-container-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post fortress-examples
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun fortress-examples
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post fortress-meta
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun fortress-meta
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post fortress-migration
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun fortress-migration
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post fortress-platform
 
 %postun fortress-platform
 
 %post fortress-testcase
-%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun fortress-testcase
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post instrument-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun instrument-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post instrument-client
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun instrument-client
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post instrument-mgr-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun instrument-mgr-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post instrument-mgr-http
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun instrument-mgr-http
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post instrument-mgr-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun instrument-mgr-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post lifecycle-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun lifecycle-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post lifecycle-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun lifecycle-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post logger
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun logger
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post monitor
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun monitor
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post pool-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun pool-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post pool-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun pool-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post pool-instrumented
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun pool-instrumented
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post sourceresolve
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun sourceresolve
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post store
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun store
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post testcase
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun testcase
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post thread-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun thread-api
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post thread-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun thread-impl
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post thread-instrumented
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun thread-instrumented
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %post xmlutil
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun xmlutil
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %if %{with_maven}
 %post maven-fortress-plugin
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun maven-fortress-plugin
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %endif
 
 %files
 %defattr(0644,root,root,0755)
 %dir %{_javadir}/%{name}
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%endif
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}/*
 
@@ -3485,9 +2981,6 @@
 %{_javadir}/%{name}/avalon-framework.jar
 %{_javadir}/avalon-framework-%{framework_version}.jar
 %{_javadir}/avalon-framework.jar
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/avalon-framework*-%{framework_version}.jar.*
-%endif
 
 %if %with repolib
 %define repodir %{_javadir}/repository.jboss.com/apache-avalon/%{framework_version}-brew
@@ -3499,26 +2992,16 @@
 %files avalon-framework-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/avalon-framework-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/avalon-framework-api*-%{framework_version}.jar.*
-%endif
 
 %files avalon-framework-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/avalon-framework-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/avalon-framework-impl*-%{framework_version}.jar.*
-%endif
 
 %files avalon-logkit
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/avalon-logkit*
 %{_javadir}/avalon-logkit*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/avalon-logkit*-%{containerkit_version}.jar.*
-%endif
-
 %if %with repolib
 %define repodir %{_javadir}/repository.jboss.com/apache-avalon-logkit/%{containerkit_version}-brew
 %files avalon-logkit-repolib
@@ -3529,157 +3012,101 @@
 %files cornerstone-connection-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-connection-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-connection-api*-%{cornerstone_version}.jar.*
-%endif
 
 %files cornerstone-connection-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-connection-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-connection-impl*-%{cornerstone_version}.jar.*
-%endif
 
 %files cornerstone-datasources-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-datasources-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-datasources-api*-%{cornerstone_version}.jar.*
-%endif
 
 %files cornerstone-datasources-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-datasources-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-datasources-impl*-%{cornerstone_version}.jar.*
-%endif
 
 %files cornerstone-scheduler-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-scheduler-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-scheduler-api*-%{cornerstone_version}.jar.*
-%endif
 
 %files cornerstone-scheduler-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-scheduler-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-scheduler-impl*-%{cornerstone_version}.jar.*
-%endif
 
 %files cornerstone-sockets-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-sockets-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-sockets-api*-%{cornerstone_version}.jar.*
-%endif
 
 %files cornerstone-sockets-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-sockets-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-sockets-impl*-%{cornerstone_version}.jar.*
-%endif
 
 %files cornerstone-store-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-store-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-store-api*-%{cornerstone_version}.jar.*
-%endif
 
 %files cornerstone-store-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-store-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-store-impl*-%{cornerstone_version}.jar.*
-%endif
 
 %files cornerstone-threads-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-threads-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-threads-api*-%{cornerstone_version}.jar.*
-%endif
 
 %files cornerstone-threads-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/cornerstone-threads-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cornerstone-threads-impl*-%{cornerstone_version}.jar.*
-%endif
+
+%files naming
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/excalibur-naming.jar
+%{_javadir}/%{name}/excalibur-naming-%{naming_version}.jar
+
+%files i18n
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/excalibur-i18n.jar
+%{_javadir}/%{name}/excalibur-i18n-%{excalidep_version}.jar
 
 %files component
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-component.jar
 %{_javadir}/%{name}/excalibur-component-%{excalidep_version}.jar
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-component-%{excalidep_version}.jar.*
-%endif
 
 %files datasource
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-datasource*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-datasource-%{components_version}.jar.*
-%endif
 
 %files event-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-event-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-event-api-%{excalidep_version}.jar.*
-%endif
 
 %files event-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-event-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-event-impl-%{excalidep_version}.jar.*
-%endif
 
 %files fortress-bean
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-fortress-bean*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-fortress-bean-%{fortress_version}.jar.*
-%endif
 
 %files fortress-container-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-fortress-container-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-fortress-container-api-%{fortress_version}.jar.*
-%endif
 
 %files fortress-container-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-fortress-container-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-fortress-container-impl-%{fortress_version}.jar.*
-%endif
 
 %files fortress-examples
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-fortress-examples*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-fortress-examples-%{fortress_version}.jar.*
-%endif
 
 %files fortress-meta
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-fortress-meta*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-fortress-meta-%{fortress_version}.jar.*
-%endif
 
 %files fortress-migration
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-fortress-migration*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-fortress-migration-%{fortress_version}.jar.*
-%endif
 
 %files fortress-platform
 %defattr(0644,root,root,0755)
@@ -3695,150 +3122,87 @@
 %files fortress-testcase
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-fortress-testcase*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-fortress-testcase-%{fortress_version}.jar.*
-%endif
 
 %files instrument-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-instrument-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-instrument-api-%{containerkit_version}.jar.*
-%endif
 
 %files instrument-client
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-instrument-client*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-instrument-client-%{containerkit_version}.jar.*
-%endif
 
 %files instrument-mgr-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-instrument-mgr-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-instrument-mgr-api-%{containerkit_version}.jar.*
-%endif
 
 %files instrument-mgr-http
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-instrument-mgr-http*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-instrument-mgr-http-%{containerkit_version}.jar.*
-%endif
 
 %files instrument-mgr-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-instrument-mgr-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-instrument-mgr-impl-%{containerkit_version}.jar.*
-%endif
 
 %files lifecycle-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-lifecycle-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-lifecycle-api-%{containerkit_version}.jar.*
-%endif
 
 %files lifecycle-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-lifecycle-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-lifecycle-impl-%{containerkit_version}.jar.*
-%endif
 
 %files logger
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-logger*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-logger-%{containerkit_version}.jar.*
-%endif
 
 %files monitor
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-monitor*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-monitor-%{components_version}.jar.*
-%endif
 
 %files pool-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-pool-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-pool-api-%{components_version}.jar.*
-%endif
 
 %files pool-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-pool-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-pool-impl-%{components_version}.jar.*
-%endif
 
 %files pool-instrumented
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-pool-instrumented*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-pool-instrumented-%{components_version}.jar.*
-%endif
 
 %files sourceresolve
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-sourceresolve*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-sourceresolve-%{components_version}.jar.*
-%endif
 
 %files store
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-store*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-store-%{components_version}.jar.*
-%endif
 
 %files testcase
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-testcase*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-testcase-%{excalidep_version}.jar.*
-%endif
 
 %files thread-api
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-thread-api*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-thread-api-%{components_version}.jar.*
-%endif
 
 %files thread-impl
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-thread-impl*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-thread-impl-%{components_version}.jar.*
-%endif
 
 %files thread-instrumented
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-thread-instrumented*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-thread-instrumented-%{components_version}.jar.*
-%endif
 
 %files xmlutil
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/excalibur-xmlutil*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/excalibur-xmlutil-%{components_version}.jar.*
-%endif
 
 %if %{with_maven}
 %files maven-fortress-plugin
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/maven-fortress-plugin*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-fortress-plugin-%{fortress_version}.jar.*
-%endif
 %endif
 
 %files avalon-framework-api-javadoc
@@ -4081,6 +3445,9 @@
 %endif
 
 %changelog
+* Fri Aug 31 2012 Ralph Apel <[email protected]> 1:1.0-0.r508111.17
+- (Re)add excalibur-i18n, excalibur-naming
+
 * Mon Feb 21 2011 David Walluck <[email protected]> 1:1.0-0.r508111.16
 - move avalon-framework to proper package