[java-sig-commits] [plexus-appserver] Drop tomcat5 dependency.

[Alexander Kurtakov]

commit 2f4871110a330815f9201f4e67727f9dd32404ae
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Dec 17 18:26:30 2010 +0200

    Drop tomcat5 dependency.
    
    Drop versioned jars.
    Adapt to current guidelines.

 plexus-appserver-1.0-build.xml |   85 ----------------------------------------
 plexus-appserver.spec          |   28 +++++--------
 2 files changed, 10 insertions(+), 103 deletions(-)
---
diff --git a/plexus-appserver.spec b/plexus-appserver.spec
index f0ac82f..f92e844 100644
--- a/plexus-appserver.spec
+++ b/plexus-appserver.spec
@@ -33,7 +33,7 @@
 
 Name:           plexus-appserver
 Version:        1.0
-Release:        0.5.a5%{?dist}
+Release:        0.6.a5%{?dist}
 Epoch:          0
 Summary:        Plexus Application Server
 License:        ASL 2.0 and MIT
@@ -42,11 +42,8 @@ URL:            http://plexus.codehaus.org/
 Source0:        plexus-appserver-1.0-alpha-5-src.tar.gz
 # svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-appserver-1.0-alpha-5/
 # tar czf plexus-appserver-1.0-alpha-5.tar.gz plexus-appserver-1.0-alpha-5/
-Source1:        plexus-appserver-1.0-build.xml
 Source2:        %{name}-depmap.xml
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -58,8 +55,6 @@ BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-surefire-plugin
-BuildRequires:  tomcat5
-BuildRequires:  tomcat5-servlet-2.4-api
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  ant-nodeps
@@ -67,7 +62,6 @@ BuildRequires:  classworlds >= 0:1.1
 BuildRequires:  plexus-container-default
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-xmlrpc >= 0:1.0-0.b4.3
-BuildRequires:  tomcat5-servlet-2.4-api
 BuildRequires:  xmlrpc
 
 Requires:          plexus-xmlrpc >= 0:1.0-0.b4.3
@@ -87,6 +81,7 @@ is like a J2EE application server, without all the baggage.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -94,10 +89,8 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -n plexus-appserver-1.0-alpha-5
-cp %{SOURCE1} build.xml
 
 %build
-
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
@@ -111,22 +104,16 @@ rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
 install -pm 644 target/%{name}-%{version}-alpha-5.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar
 %add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-5 JPP/%{parent} %{subname}
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
-  do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
 #poms
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.plexus-appserver.pom
 
 # 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} # ghost symlink
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %post
 %update_maven_depmap
@@ -145,6 +132,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Dec 17 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.6.a5
+- Drop tomcat5 dependency.
+- Drop versioned jars.
+- Adapt to current guidelines.
+
 * Wed Sep  8 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.0-0.5.a5
 - Add depmap for old plexus-container to fix build errors
 - Remove ant build possibility