From c801bfe7c0e42ec3e5a2c39a1035cdd1946f3e4c Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Jan 02 2014 10:29:00 +0000 Subject: Restore PGP signing ability - Remove unneeded R --- diff --git a/apache-ivy.spec b/apache-ivy.spec index 5199f6b..a4523b8 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,9 +1,8 @@ Name: apache-ivy Version: 2.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java-based dependency manager -Group: Development/Tools License: ASL 2.0 URL: http://ant.apache.org/ivy/ Source0: http://www.apache.org/dist/ant/ivy/%{version}/%{name}-%{version}-src.tar.gz @@ -31,8 +30,6 @@ reporting and publication. %package javadoc Summary: API Documentation for ivy Group: Development/Tools -Requires: %{name} = %{version}-%{release} -Requires: jpackage-utils %description javadoc JavaDoc documentation for %{name} @@ -47,8 +44,6 @@ do touch -r $F $F.utf8 mv $F.utf8 $F done -rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle - # ant-trax has been obsoleted, use main ant package sed -i s/ant-trax/ant/ ivy.xml @@ -64,7 +59,7 @@ rm -rf doc build/doc # Craft class path mkdir -p lib -build-jar-repository lib ant commons-vfs jakarta-commons-httpclient jakarta-oro jsch +build-jar-repository lib ant commons-vfs jakarta-commons-httpclient jakarta-oro jsch bcprov bcpg # Build ant /localivy /offline -Dtarget.ivy.bundle.version=%{version} -Dtarget.ivy.bundle.version.qualifier= -Dtarget.ivy.version=%{version} jar javadoc @@ -87,6 +82,10 @@ echo "ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} %doc LICENSE %changelog +* Thu Jan 02 2014 Michal Srb - 2.3.0-6 +- Restore PGP signing ability +- Remove unneeded R + * Thu Dec 12 2013 Mikolaj Izdebski - 2.3.0-5 - Enable VFS resolver