commit c6ccdf7462ddfcc0376f4a06a4ad274932d7ec7e
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Thu Jul 28 13:54:58 2011 +0200
plexus-maven-plugin removed (not needed)
plexus-xmlrpc.spec | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
---
diff --git a/plexus-xmlrpc.spec b/plexus-xmlrpc.spec
index d2b9bac..2bcdc55 100644
--- a/plexus-xmlrpc.spec
+++ b/plexus-xmlrpc.spec
@@ -38,7 +38,7 @@
Name: plexus-xmlrpc
Version: 1.0
-Release: 0.5.b4.3%{?dist}
+Release: 0.6.b4.3%{?dist}
Epoch: 0
Summary: Plexus XML RPC Component
License: ASL 1.1 and MIT
@@ -57,7 +57,7 @@ BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
BuildRequires: ant-nodeps
%if %{with_maven}
-BuildRequires: maven2 >= 2.0.4-9
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -67,7 +67,6 @@ BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
-BuildRequires: plexus-maven-plugin
%endif
BuildRequires: classworlds >= 0:1.1
BuildRequires: apache-commons-codec
@@ -81,9 +80,6 @@ Requires: plexus-container-default
Requires: plexus-utils
Requires: xmlrpc
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
-
%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
@@ -113,10 +109,10 @@ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
%if %{with_maven}
- mvn-jpp \
+ mvn-rpmbuild \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+ install javadoc:aggregate
%else
mkdir -p target/lib
build-jar-repository -s -p target/lib \
@@ -130,30 +126,21 @@ ant jar javadoc
%endif
%install
-rm -rf $RPM_BUILD_ROOT
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
+install -d -m 755 %{buildroot}/%{_javadir}/plexus
install -pm 644 target/plexus-xmlrpc-%{version}-beta-4.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/xmlrpc.jar
-%add_to_maven_depmap org.codehaus.plexus plexus-xmlrpc 1.0-beta-4 JPP/plexus xmlrpc
+ %{buildroot}/%{_javadir}/plexus/xmlrpc.jar
#poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.plexus-xmlrpc.pom
+install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom
+%add_maven_depmap JPP.%{name}.pom %{parent}/%{subname}.jar
# 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}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}/%{_javadocdir}/%{name}
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%doc LICENSE.txt
@@ -161,10 +148,14 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%changelog
+* Thu Jul 28 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:1.0-0.6.b4.3
+- Migration to maven3
+- Removal of plexus-maven-plugin (not needed)
+- Minor spec file changes according to the latest guidelines
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:1.0-0.5.b4.3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild