From 0e2921ef551499374bb91413f1929e90b05415bf Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: Dec 15 2005 10:01:34 +0000
Subject: Back out failed upgrade and bump for gcc rebuild


---

diff --git a/.cvsignore b/.cvsignore
index 43e48dd..7e7ae1c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-avalon-framework-4.1.5.src.tar.gz
-avalon-framework
+Avalon-4.1.4-src.tar.gz
+Avalon-4.1.4
 noarch
 *.src.rpm
diff --git a/avalon-framework.spec b/avalon-framework.spec
index 7d16c58..e92989c 100644
--- a/avalon-framework.spec
+++ b/avalon-framework.spec
@@ -1,7 +1,8 @@
 %define short_name	framework
+%define short_Name	Avalon
 %define name		avalon-%{short_name}
-%define version		4.1.5
-%define release		1jpp_1fc.1
+%define version		4.1.4
+%define release		2jpp_6fc
 %define section		free
 
 Name:		%{name}
@@ -14,7 +15,7 @@ Url:		http://avalon.apache.org/%{short_name}/
 Group:		Development/Libraries/Application Frameworks
 #Vendor:		JPackage Project
 #Distribution:	JPackage
-Source0:	http://apache.mirror.mcgill.ca/avalon/avalon-framework/v4.1.5/avalon-framework-4.1.5.src.tar.gz
+Source0:	http://www.apache.org/dist/avalon/framework/v4.1.4/Avalon-4.1.4-src.tar.gz
 Requires:	xml-commons-apis
 Requires:	xalan-j2
 BuildRequires:	ant
@@ -51,22 +52,14 @@ Javadoc for %{name}.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -n %{name}
+%setup -n %{short_Name}-%{version}
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
 export CLASSPATH=%(build-classpath avalon-logkit junit log4j junit)
-
-pushd api
-ant
-ant javadocs
-popd
-
-pushd impl
-ant
+ant all
 ant javadocs
-popd
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -102,20 +95,8 @@ fi
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
-* Wed Dec 14 2005 Jesse Keating <jkeating@redhat.com> 
-- bump to build w/ new gcj
-
-* Tue Jan 11 2005 Gary Benson <gbenson@redhat.com> 0:4.1.5-1jpp_1fc
-- Sync with RHAPS.
-
-* Fri Dec 24 2004 Fernando Nasser <fnasser@redhat.com> 0:4.1.5-1jpp_1rh
-- Merge with upstream for upgrade
-
-* Fri Dec 24 2004 Fernando Nasser <fnasser@redhat.com> 0:4.1.5-1jpp
-- Upgrade to 4.1.5
-
-* Mon Nov 15 2004 Fernando Nasser <fnasser@redhat.com> 0:4.1.4-2jpp_4rh
-- Rebuild
+* Thu Dec 15 2005 Gary Benson <gbenson@redhat.com> 0:4.1.4-2jpp_6fc
+- Rebuild for new gcj.
 
 * Thu Nov  4 2004 Gary Benson <gbenson@redhat.com> 0:4.1.4-2jpp_5fc
 - Build into Fedora.
diff --git a/sources b/sources
index 69dce4e..e59ede5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9f248515f37a24cbda8f3688f0fc10f  avalon-framework-4.1.5.src.tar.gz
+2bcef3a218b6ee81acc4dc87af65d8df  Avalon-4.1.4-src.tar.gz