[ant-contrib] Adapt to current guidelines.

Alexander Kurtakov akurtakov at fedoraproject.org
Fri Nov 25 11:49:44 UTC 2011


commit 9c3fcaa35ad76d6b66ef4eb2ef9d786cc601e31b
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Fri Nov 25 13:47:24 2011 +0200

    Adapt to current guidelines.

 ant-contrib.spec |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/ant-contrib.spec b/ant-contrib.spec
index 4ea2a0a..987c4bb 100644
--- a/ant-contrib.spec
+++ b/ant-contrib.spec
@@ -3,7 +3,7 @@
 Summary:        Collection of tasks for Ant
 Name:           ant-contrib
 Version:        1.0
-Release:        0.12.%{beta_number}%{?dist}
+Release:        0.13.%{beta_number}%{?dist}
 License:        ASL 2.0
 URL:            http://ant-contrib.sourceforge.net/
 Group:          Development/Libraries
@@ -62,41 +62,34 @@ rm -rf $RPM_BUILD_ROOT
 install -Dpm 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
 
 # javadoc
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
-rm -rf build/docs/api
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
 echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
 
-%add_to_maven_depmap %{name} %{name} %{version} JPP/ant %{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom ant/%{name}.jar
 
 %files
-%defattr(-,root,root,-)
 %{_sysconfdir}/ant.d/ant-contrib
 %{_javadir}/ant/*.jar
 %{_mavenpomdir}/*
-%{_mavendepmapdir}
+%{_mavendepmapfragdir}/*
 %doc build/docs/LICENSE.txt
 %doc build/docs/tasks/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Nov 25 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.13.b2
+- Adapt to current guidelines.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.12.b2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list