commit 5266d11f5b334a7def96fcb76cb66022eaac70bc Author: Alexander Kurtakov akurtako@redhat.com Date: Mon Jan 3 18:48:36 2011 +0200
Drop tomcat5 BRs.
Adapt to current guidelines.
plexus-xmlrpc.spec | 41 ++++++++++++++++++----------------------- 1 files changed, 18 insertions(+), 23 deletions(-) --- diff --git a/plexus-xmlrpc.spec b/plexus-xmlrpc.spec index cabee34..8bd15c8 100644 --- a/plexus-xmlrpc.spec +++ b/plexus-xmlrpc.spec @@ -30,15 +30,15 @@
# If you don't want to build with maven, and use straight ant instead, # give rpmbuild option '--without maven' -%define with_maven %{!?_without_maven:1}%{?_without_maven:0} -%define without_maven %{?_without_maven:1}%{!?_without_maven:0} +%global with_maven %{!?_without_maven:1}%{?_without_maven:0} +%global without_maven %{?_without_maven:1}%{!?_without_maven:0}
-%define parent plexus -%define subname appserver +%global parent plexus +%global subname xmlrpc
Name: plexus-xmlrpc Version: 1.0 -Release: 0.4.b4.2.17%{?dist} +Release: 0.4.b4.3%{?dist} Epoch: 0 Summary: Plexus XML RPC Component License: ASL 1.1 and MIT @@ -51,8 +51,6 @@ Source1: %{name}-1.0-build.xml
Patch0: %{name}-add-codec-dep.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2 @@ -60,18 +58,16 @@ BuildRequires: ant >= 0:1.6 BuildRequires: ant-nodeps %if %{with_maven} BuildRequires: maven2 >= 2.0.4-9 -BuildRequires: maven2-plugin-compiler -BuildRequires: maven2-plugin-install -BuildRequires: maven2-plugin-jar -BuildRequires: maven2-plugin-javadoc -BuildRequires: maven2-plugin-resources +BuildRequires: maven-compiler-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-resources-plugin BuildRequires: maven-surefire-maven-plugin BuildRequires: maven-surefire-provider-junit BuildRequires: maven-doxia BuildRequires: maven-doxia-sitetools BuildRequires: plexus-maven-plugin -BuildRequires: tomcat5 -BuildRequires: tomcat5-servlet-2.4-api %endif BuildRequires: classworlds >= 0:1.1 BuildRequires: apache-commons-codec @@ -119,7 +115,7 @@ mkdir -p $MAVEN_REPO_LOCAL %if %{with_maven} mvn-jpp \ -e \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ install javadoc:javadoc %else mkdir -p target/lib @@ -138,10 +134,8 @@ rm -rf $RPM_BUILD_ROOT # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus install -pm 644 target/plexus-xmlrpc-%{version}-beta-4.jar \ - $RPM_BUILD_ROOT%{_javadir}/plexus/xmlrpc-%{version}.jar + $RPM_BUILD_ROOT%{_javadir}/plexus/xmlrpc.jar %add_to_maven_depmap org.codehaus.plexus plexus-xmlrpc 1.0-beta-4 JPP/plexus xmlrpc -(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%{_datadir}/maven2/poms @@ -152,9 +146,6 @@ 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}
-%clean -rm -rf $RPM_BUILD_ROOT - %post %update_maven_depmap
@@ -163,8 +154,8 @@ rm -rf $RPM_BUILD_ROOT
%files %defattr(-,root,root,-) -%{_javadir} -%{_datadir}/maven2 +%{_javadir}/* +%{_mavenpomdir}/* %doc LICENSE.txt %{_mavendepmapfragdir}/plexus-xmlrpc
@@ -174,6 +165,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_javadocdir}/*
%changelog +* Mon Jan 3 2011 Alexander Kurtakov akurtako@redhat.com 0:1.0-0.4.b4.3 +- Drop tomcat5 BRs. +- Adapt to current guidelines. + * Fri May 21 2010 Alexander Kurtakov akurtako@redhat.com 0:1.0-0.4.b4.2.17 - BR apache-commons-codec.