- Update to 1.9.3

- BugFixes:
  * Ant 1.8 exec task changes have slowed exec to a crawl, apache#54128
  * <parallel> swallowed the status code of nested <fail> tasks,
   apache#55539
  * a race condition could make <fixcrlf> tasks of parallel builds to
    interfere with each other, apache#54393
 * <mail>'s mailport still didn't work properly when using smtps,
   apache#49267
 * using attributes belonging to the if and unless namespaces
   made macrodef fail, apache#55885.
 * Apt is not available under JDK 1.8, apache#55922
- drop unused macros

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=47

ant.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ant
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2009, JPackage Project
 # All rights reserved.
 #
@@ -18,43 +18,38 @@
 #
 
 
-#
-%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-
 %global bootstrap 1
 
-%if ! %with bootstrap
 # disable javadoc build on arm platform - it delays a build a lot
+# mvyskocil: ifarch does not work for noarch packages ...
 %if %{_arch} != arm
-%global build_javadoc        1
+%global build_javadoc 1
+%else
+%global build_javadoc 0
 %endif
-%endif
-
-%global with_manifest_only 0
 
 %global ant_home %{_datadir}/ant
 
 %global major_version 1.9
-%global cvs_version 1.9.2
 
 Name:           ant
-Version:        1.9.2
+Version:        1.9.3
 Release:        0
 Summary:        Antlr Task for ant
 License:        Apache-2.0
 Group:          Development/Tools/Building
 Url:            http://ant.apache.org/
-Source0:        http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2
+Source0:        http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
 Source1:        apache-ant-1.8.ant.conf
 Source1000:     pre_checkin.sh
+Source1001:     http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc
+Source1002:     ant.keyring
 
 Patch0:         apache-ant-no-test-jar.patch
 Patch1:         apache-ant-class-path-in-manifest.patch
 
 %if %bootstrap
+BuildRequires:  gpg-offline
 BuildRequires:  java-1_5_0-gcj-compat-devel
 #!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel
 #!BuildIgnore:  java-1_7_0-openjdk java-1_7_0-openjdk-devel
@@ -451,7 +446,10 @@ This package contains the javadoc documentation for Apache Ant.
 %endif
 
 %prep
-%setup -q -n apache-ant-%{cvs_version}
+%if %bootstrap
+%gpg_verify %{SOURCE1001}
+%endif
+%setup -q -n apache-ant-%{version}
 #Fixup version
 find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//