diff --git a/apache-ivy.changes b/apache-ivy.changes index 26c19e4..795c744 100644 --- a/apache-ivy.changes +++ b/apache-ivy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 8 11:01:30 UTC 2014 - tchvatal@suse.com + +- Do not depend on ant-nodeps. + ------------------------------------------------------------------- Wed Nov 6 10:58:10 UTC 2013 - mvyskocil@suse.com diff --git a/apache-ivy.spec b/apache-ivy.spec index 9557204..88a4bdd 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,7 +1,7 @@ # # spec file for package apache-ivy # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -18,22 +18,15 @@ Name: apache-ivy Version: 2.3.0 -Release: 1%{?dist} +Release: 0 Summary: Java-based dependency manager License: Apache-2.0 Group: Development/Tools/Building - Url: http://ant.apache.org/ivy/ Source0: %{name}-%{version}-src.tar.gz Source1: ivy.1 Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.3.0/ivy-2.3.0.pom -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - -Provides: ivy = %{version}-%{release} - BuildRequires: ant -BuildRequires: ant-nodeps BuildRequires: bouncycastle BuildRequires: commons-httpclient BuildRequires: java-devel >= 1.5 @@ -41,6 +34,9 @@ BuildRequires: javapackages-tools BuildRequires: jsch BuildRequires: oro Requires: javapackages-tools +Provides: ivy = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Apache Ivy is a tool for managing (recording, tracking, resolving and @@ -50,7 +46,6 @@ 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/Building @@ -59,7 +54,6 @@ Requires: %{name} = %{version}-%{release} %description javadoc JavaDoc documentation for %{name} - %prep %setup -q @@ -114,8 +108,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/ant.d echo "ivy" > %{buildroot}%{_sysconfdir}/ant.d/%{name} # Man page -install -d ${RPM_BUILD_ROOT}%{_mandir}/man1 -install %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man1/ivy.1 +install -d %{buildroot}%{_mandir}/man1 +install %{SOURCE1} %{buildroot}%{_mandir}/man1/ivy.1 %files %defattr(-,root,root,-)