Accepting request 497064 from Java:packages

- Reduce deps a bit

- New build dependency: javapackages-local

OBS-URL: https://build.opensuse.org/request/show/497064
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-ivy?expand=0&rev=11

apache-ivy.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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
+
+- New build dependency: javapackages-local 
+
 -------------------------------------------------------------------
 Wed Mar 18 09:46:01 UTC 2015 - tchvatal@suse.com
 

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 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,13 +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
@@ -58,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 RELEASE_NOTES CHANGES.txt
 
 #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
 
@@ -79,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