From cc2e6ecd2354b759e5dff6e2f9c23fcbf4d761f04e3659799642a9c6cc70a564 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Mon, 16 Jan 2012 14:56:37 +0000
Subject: [PATCH] - Initial SUSE packaging of apache-ivy 2.2.0   (without
 signing support)

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=4
---
 apache-ivy-2.1.0-src.tar.gz | 3 ---
 apache-ivy-2.2.0-src.tar.gz | 3 +++
 apache-ivy.changes          | 6 ++++++
 apache-ivy.spec             | 8 ++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)
 delete mode 100644 apache-ivy-2.1.0-src.tar.gz
 create mode 100644 apache-ivy-2.2.0-src.tar.gz
 create mode 100644 apache-ivy.changes

diff --git a/apache-ivy-2.1.0-src.tar.gz b/apache-ivy-2.1.0-src.tar.gz
deleted file mode 100644
index 085e026..0000000
--- a/apache-ivy-2.1.0-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1cfa375466522ae24b34aa8e285502be1c951ba3fa9081b3e1d9ae432f099408
-size 2407345
diff --git a/apache-ivy-2.2.0-src.tar.gz b/apache-ivy-2.2.0-src.tar.gz
new file mode 100644
index 0000000..14f0f01
--- /dev/null
+++ b/apache-ivy-2.2.0-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:338312a9df91825bfddb5705a41d122d0495c984f8689bcef0b2f3cbce6b0294
+size 2513320
diff --git a/apache-ivy.changes b/apache-ivy.changes
new file mode 100644
index 0000000..6df39db
--- /dev/null
+++ b/apache-ivy.changes
@@ -0,0 +1,6 @@
+-------------------------------------------------------------------
+Mon Jan 16 14:55:55 UTC 2012 - mvyskocil@suse.cz
+
+- Initial SUSE packaging of apache-ivy 2.2.0
+  (without signing support)
+
diff --git a/apache-ivy.spec b/apache-ivy.spec
index 0d5cf47..6583a57 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -1,10 +1,10 @@
 Name:           apache-ivy
-Version:        2.1.0
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        Java-based dependency manager
 
 Group:          Development/Tools/Building
-License:        ASL 2.0
+License:        Apache-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)
@@ -22,6 +22,7 @@ BuildRequires:  commons-httpclient
 BuildRequires:  jsch
 BuildRequires:  oro
 BuildRequires:  java-devel >= 1.5
+BuildRequires:  bouncycastle
 BuildRequires:  jpackage-utils
 Requires:       jpackage-utils
 
@@ -54,6 +55,9 @@ do
         mv $F.utf8 $F
 done
 
+#TODO: return back when bouncycastle-pgp will be available
+rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle
+
 
 %build
 # Remove prebuilt documentation