[java-sig-commits] [maven-ant-tasks/f15/master: 2/3] Install unversioned jar & javadocs

[Stanislav Ochotnicky]

commit 5554ebaeebaef2198dd5d7c91d27366902aa7380
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Feb 16 17:32:12 2011 +0100

    Install unversioned jar & javadocs

 maven-ant-tasks.spec |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/maven-ant-tasks.spec b/maven-ant-tasks.spec
index e7d592b..20982c8 100644
--- a/maven-ant-tasks.spec
+++ b/maven-ant-tasks.spec
@@ -1,6 +1,6 @@
 Name:           maven-ant-tasks
 Version:        2.1.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Allow Maven artifact handling features to be used from within an Ant build
 
 Group:          Development/Libraries
@@ -12,7 +12,6 @@ Source0:        http://www.apache.org/dist/maven/source/maven-ant-tasks-%{versio
 Source1:        %{name}.depmap
 #Fix up ant groupId
 Patch0:         maven-ant-tasks-2.1.1-ant-groupId.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils
@@ -65,7 +64,7 @@ This package contains the API documentation for %{name}.
 for f in src/it/*/invoker.properties
 do
    tp=${f/invoker/test}
-   cat >> $tp <<EOF 
+   cat >> $tp <<EOF
 maven2.jpp.mode=1
 EOF
 done
@@ -82,27 +81,26 @@ mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p target/original-%{name}-%{version}.jar \
-      $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+      $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
 cp -rp target/site/apidocs \
-       $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+       $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml \
-$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
 %add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %post
 %update_maven_depmap
@@ -122,10 +120,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}
 
 
 %changelog
+* Wed Feb 16 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.1.1-8
+- Install unversioned jar & javadocs
+
 * Wed Feb 16 2011 Orion Poplawski <orion at cora.nwra.com> 2.1.1-7
 - Install the unbundled jar (bug #677736)