From 6a68695c7325d075a0ad4dfa2c9f907059eb4151 Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: Jan 31 2005 10:13:48 +0000
Subject: Sync with RHAPS


---

diff --git a/.cvsignore b/.cvsignore
index 6ea8001..47ff6eb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-axis-1_1-src.tar.gz
+axis-1_2RC2-src.tar.gz
diff --git a/axis.spec b/axis.spec
index 197db4d..1a0f1e1 100644
--- a/axis.spec
+++ b/axis.spec
@@ -1,7 +1,7 @@
 %define name       axis
-%define version    1.1
-%define archivever 1_1
-%define release    2jpp_1rh
+%define version    1.2
+%define archivever 1_2RC2
+%define release    0.rc2.1jpp_1rh
 %define section    free
 
 Name:          %{name}
@@ -15,14 +15,31 @@ Url:           http://ws.apache.org/%{name}/
 Source0:       %{url}/dist/%{archivever}/%{name}-%{archivever}-src.tar.gz
 #Vendor:        JPackage Project
 #Distribution:  JPackage
-Requires:      jpackage-utils >= 0:1.5, java
-Requires:      wsdl4j jakarta-commons-logging jakarta-commons-discovery log4j jaf javamail
-BuildRequires: jpackage-utils >= 0:1.5, java-devel, ant
+BuildRequires: jpackage-utils >= 0:1.5
+BuildRequires: java-devel
+BuildRequires: ant
 # Mandatory requires
-BuildRequires: wsdl4j jakarta-commons-logging jakarta-commons-discovery log4j jaf javamail
+BuildRequires: wsdl4j
+BuildRequires: jakarta-commons-logging
+BuildRequires: jakarta-commons-discovery
+BuildRequires: log4j
+BuildRequires: javamail
+BuildRequires: jaf
 # optional requires
-BuildRequires: servlet oro junit jimi jsse jakarta-commons-httpclient httpunit jms castor
+BuildRequires: servlet oro junit jimi jsse
+BuildRequires: jakarta-commons-httpclient
+BuildRequires: httpunit
+BuildRequires: jms
+BuildRequires: castor
 #BuildRequires: xml-security
+Requires:      jpackage-utils >= 0:1.5
+Requires:      java
+Requires:      wsdl4j
+Requires:      jakarta-commons-logging
+Requires:      jakarta-commons-discovery
+Requires:      log4j
+Requires:      jaf
+Requires:      javamail
 BuildArch:     noarch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-buildroot
 
@@ -144,6 +161,12 @@ fi
 %doc docs/*
 
 %changelog
+* Wed Dec 22 2004 Fernando Nasser <fnasser@redhat.com> 0:1.2-0.rc2.1jpp_1rh
+- Merge with upstream for upgrade
+
+* Wed Dec 22 2004 Fernando Nasser <fnasser@redhat.com> 0:1.2-0.rc2.1jpp
+- Upgrade to 1.2.rc2
+
 * Thu Mar  4 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.1-2jpp_1rh
 - RH vacuuming
 
diff --git a/sources b/sources
index 56558a4..7cb32ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-845a01e617d269fe1c3390fb83ce67df  axis-1_1-src.tar.gz
+a5424fcb51e2f3e9ad53db2186185ad6  axis-1_2RC2-src.tar.gz