From 74d52ecdbebb6f40919f222d37095d9fd499a7206b665e4d45cf3a342add9402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 19 May 2017 10:10:56 +0000
Subject: [PATCH 1/3] Accepting request 496564 from
 home:pcervinka:branches:Java:packages

- New build dependency: javapackages-local

OBS-URL: https://build.opensuse.org/request/show/496564
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=27
---
 apache-ivy.changes | 5 +++++
 apache-ivy.spec    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apache-ivy.changes b/apache-ivy.changes
index 548ccf0..c427c65 100644
--- a/apache-ivy.changes
+++ b/apache-ivy.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 19 10:07:03 UTC 2017 - pcervinka@suse.com
+
+- New build dependency: javapackages-local 
+
 -------------------------------------------------------------------
 Wed Mar 18 09:46:01 UTC 2015 - tchvatal@suse.com
 
diff --git a/apache-ivy.spec b/apache-ivy.spec
index 7a1c44e..598ff26 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-ivy
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,7 @@ BuildRequires:  ant
 BuildRequires:  bouncycastle
 BuildRequires:  commons-httpclient
 BuildRequires:  java-devel >= 1.5
+BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  jsch
 BuildRequires:  oro

From 75db069404916e1f4c365f9952173aec01f5dbd2aa54335e804ebccf38e500d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sun, 21 May 2017 08:00:08 +0000
Subject: [PATCH 2/3] - Reduce deps a bit

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=28
---
 apache-ivy.changes |  5 +++++
 apache-ivy.spec    | 18 ++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/apache-ivy.changes b/apache-ivy.changes
index c427c65..4f5ee8d 100644
--- a/apache-ivy.changes
+++ b/apache-ivy.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun May 21 08:01:08 UTC 2017 - tchvatal@suse.com
+
+- Reduce deps a bit
+
 -------------------------------------------------------------------
 Fri May 19 10:07:03 UTC 2017 - pcervinka@suse.com
 
diff --git a/apache-ivy.spec b/apache-ivy.spec
index 598ff26..eda19d4 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-ivy
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,14 +29,13 @@ Source2:        http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.3.0/ivy-2.3.0
 BuildRequires:  ant
 BuildRequires:  bouncycastle
 BuildRequires:  commons-httpclient
-BuildRequires:  java-devel >= 1.5
+BuildRequires:  dos2unix
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  jsch
 BuildRequires:  oro
-Requires:       javapackages-tools
-Provides:       ivy = %{version}-%{release}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Provides:       ivy = %{version}
+Obsoletes:      ivy < %{version}
 BuildArch:      noarch
 
 %description
@@ -59,17 +58,11 @@ JavaDoc documentation for %{name}
 %setup -q
 
 # Fix messed-up encodings
-for F in README LICENSE NOTICE
-do
-        sed 's/\r//' $F |iconv -f iso8859-1 -t utf8 >$F.utf8
-        touch -r $F $F.utf8
-        mv $F.utf8 $F
-done
+dos2unix README LICENSE NOTICE
 
 #TODO: return back when bouncycastle-pgp will be available
 rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle
 
-%build
 # Remove prebuilt documentation
 rm -rf doc build/doc
 
@@ -80,6 +73,7 @@ rm -rf src/java/org/apache/ivy/plugins/repository/vfs \
 sed '/vfs.*=.*org.apache.ivy.plugins.resolver.VfsResolver/d' -i \
         src/java/org/apache/ivy/core/settings/typedef.properties
 
+%build
 # Craft class path
 mkdir -p lib
 build-jar-repository lib ant ant/ant-nodeps oro jsch commons-httpclient

From 3ea7c9dd24ff2f514219266977de4b09ce07916259af593ae1cc2650ea878eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sun, 21 May 2017 08:01:01 +0000
Subject: [PATCH 3/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=29

---
 apache-ivy.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apache-ivy.spec b/apache-ivy.spec
index eda19d4..6e3f097 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -58,7 +58,7 @@ JavaDoc documentation for %{name}
 %setup -q
 
 # Fix messed-up encodings
-dos2unix README LICENSE NOTICE
+dos2unix README LICENSE NOTICE RELEASE_NOTES CHANGES.txt
 
 #TODO: return back when bouncycastle-pgp will be available
 rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle