[java-sig-commits] [plexus-interactivity] Fix pom filenames (Resolves rhbz#655821)

[Stanislav Ochotnicky]

commit 16e6528b0e4623f70939454a038ad0898f248ff7
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Dec 1 17:13:30 2010 +0100

    Fix pom filenames (Resolves rhbz#655821)
    
    Cleanups according to new guidelines

 plexus-interactivity.spec |   43 +++++++++++++++++++++----------------------
 1 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/plexus-interactivity.spec b/plexus-interactivity.spec
index fd96bee..2d24ee1 100644
--- a/plexus-interactivity.spec
+++ b/plexus-interactivity.spec
@@ -33,7 +33,7 @@
 
 Name:           plexus-interactivity
 Version:        1.0
-Release:        0.3.a6.6%{?dist}
+Release:        0.3.a6.7%{?dist}
 Epoch:          0
 Summary:        Plexus Interactivity Handler Component
 License:        MIT
@@ -50,7 +50,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
-BuildRequires:  ant-nodeps 
+BuildRequires:  ant-nodeps
 BuildRequires:  maven2
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-javadoc-plugin
@@ -77,10 +77,11 @@ is like a J2EE application server, without all the baggage.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
-Javadoc for %{name}.
+API documentation for %{name}.
 
 %prep
 %setup -q -n plexus-interactivity-1.0-alpha-6
@@ -95,43 +96,37 @@ mvn-jpp \
         install javadoc:aggregate
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
 install -pm 644 \
   plexus-interactivity-api/target/%{name}-api-%{version}-alpha-6.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-api-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-api.jar
 install -pm 644 \
   plexus-interactivity-jline/target/%{name}-jline-%{version}-alpha-6.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-jline-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && \
- for jar in *-%{version}*; do \
-     ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; \
- done \
-)
+  $RPM_BUILD_ROOT%{_javadir}/plexus/interactivity-jline.jar
 
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 \
-pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom 
+pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
 install -pm 644 \
 plexus-interactivity-api/pom.xml \
- 	$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-interactivity-api.pom 
+ 	$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-interactivity-api.pom
 install -pm 644 \
 plexus-interactivity-jline/pom.xml \
- 	$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-interactivity-jline.pom 
+ 	$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-interactivity-jline.pom
 
 %add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
 %add_to_maven_depmap org.codehaus.plexus %{name}-api %{version} JPP/%{parent} interactivity-api
-%add_to_maven_depmap org.codehaus.plexus %{name}-jline %{version} JPP/%{parent} interactivity-jline 
+%add_to_maven_depmap org.codehaus.plexus %{name}-jline %{version} JPP/%{parent} interactivity-jline
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* \
-  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug #447156 (can be removed in F-17)
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %post
 %update_maven_depmap
@@ -151,6 +146,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  1 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.0-0.3.a6.7
+- Fix pom filenames (Resolves rhbz#655821)
+- Cleanups according to new guidelines
+
 * Wed Oct 6 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.3.a6.6
 - Use javadoc:aggregate.