From acd3600a5475d641644128b1dac321e7edf70b7e Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Feb 25 2011 20:39:20 +0000
Subject: Update to 2.2.0.


---

diff --git a/.gitignore b/.gitignore
index 2538b7b..a29499e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 apache-ivy-2.1.0-src.tar.gz
+/apache-ivy-2.2.0-src.tar.gz
diff --git a/apache-ivy.spec b/apache-ivy.spec
index fb5b078..2339e04 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -1,25 +1,26 @@
 Name:           apache-ivy
-Version:        2.1.0
-Release:        2%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        Java-based dependency manager
 
 Group:          Development/Tools
 License:        ASL 2.0
 URL:            http://ant.apache.org/ivy/
-Source0:        http://www.apache.org/dist/ant/ivy/2.1.0/%{name}-%{version}-src.tar.gz
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source0:        http://www.apache.org/dist/ant/ivy/%{version}/%{name}-%{version}-src.tar.gz
 BuildArch:      noarch
 
 Provides:       ivy = %{version}-%{release}
 
 BuildRequires:  ant
-BuildRequires:  ant-nodeps
-BuildRequires:  commons-httpclient
+BuildRequires:  jakarta-commons-httpclient
 BuildRequires:  jsch
-BuildRequires:  oro
+BuildRequires:  jakarta-oro
 BuildRequires:  java-devel >= 1.5
 BuildRequires:  jpackage-utils
 Requires:       jpackage-utils
+Requires:       jakarta-oro
+Requires:       jsch
+Requires:       jakarta-commons-httpclient
 
 %description
 Apache Ivy is a tool for managing (recording, tracking, resolving and
@@ -29,16 +30,15 @@ tool, Apache Ivy works particularly well with Apache Ant providing a number
 of powerful Ant tasks ranging from dependency resolution to dependency
 reporting and publication.
 
-
 %package javadoc
 Summary:        API Documentation for ivy
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
+Requires:       jpackage-utils
 
 %description javadoc
 JavaDoc documentation for %{name}
 
-
 %prep
 %setup -q
 
@@ -49,7 +49,7 @@ do
         touch -r $F $F.utf8
         mv $F.utf8 $F
 done
-
+rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle
 
 %build
 # Remove prebuilt documentation
@@ -64,41 +64,34 @@ sed '/vfs.*=.*org.apache.ivy.plugins.resolver.VfsResolver/d' -i \
 
 # Craft class path
 mkdir -p lib
-build-jar-repository lib ant ant/ant-nodeps commons-httpclient oro jsch
+build-jar-repository lib ant jakarta-commons-httpclient jakarta-oro jsch bcprov bctsp bcmail
 
 # Build
 ant /localivy /offline jar javadoc
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # Code
 install -d $RPM_BUILD_ROOT%{_javadir}
-install -p -m644 build/artifact/jars/ivy.jar $RPM_BUILD_ROOT%{_javadir}/ivy-%{version}.jar
-ln -sf ivy-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ivy.jar
+install -p -m644 build/artifact/jars/ivy.jar $RPM_BUILD_ROOT%{_javadir}/ivy.jar
 
 # API Documentation
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp build/doc/reports/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp build/doc/reports/api/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
 %doc RELEASE_NOTES CHANGES.txt LICENSE NOTICE README
 
-
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/*
 
-
 %changelog
+* Fri Feb 25 2011 Alexander Kurtakov <akurtako@redhat.com> 2.2.0-1
+- Update to 2.2.0.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 54dbab0..5c45c7f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 49130a0c8beb74d77653e5443dacecd5  apache-ivy-2.1.0-src.tar.gz
+9dab58aee2777bd72e3cff2f3ff9a119  apache-ivy-2.2.0-src.tar.gz