commit 7fe18d7e768afb3b51e954e5eea9276fb0442935
Author: Alexander Kurtakov <akurtakov(a)gmail.com>
Date: Sun Jun 12 14:39:42 2011 +0300
Build with maven 3.x
...fault-role-hint-to-DefaultResourceManager.patch | 25 ---------
plexus-resources-1.0-jpp-depmap.xml | 14 -----
plexus-resources-settings.xml | 47 ----------------
plexus-resources.spec | 56 +++++---------------
4 files changed, 14 insertions(+), 128 deletions(-)
---
diff --git a/plexus-resources.spec b/plexus-resources.spec
index f85d6c1..0cff732 100644
--- a/plexus-resources.spec
+++ b/plexus-resources.spec
@@ -34,7 +34,7 @@
Name: %{parent}-%{subname}
Version: 1.0
-Release: 0.4.a7%{?dist}
+Release: 0.5.a7%{?dist}
Summary: Plexus Resource Manager
License: MIT
Group: Development/Tools
@@ -42,9 +42,6 @@ URL:
http://plexus.codehaus.org/
# svn export
http://svn.codehaus.org/plexus/plexus-components/tags/plexus-resources-1....
# tar caf plexus-resources-1.0-alpha-7-src.tar.xz plexus-resources-1.0-alpha-7
Source0: %{name}-%{version}-alpha-7-src.tar.xz
-Source3: plexus-resources-settings.xml
-Source4: plexus-resources-1.0-jpp-depmap.xml
-Patch0: 0001-Add-default-role-hint-to-DefaultResourceManager.patch
Requires: classworlds >= 0:1.1
Requires: plexus-container-default
Requires: plexus-utils
@@ -54,14 +51,14 @@ Requires(postun): jpackage-utils >= 0:1.7.3
BuildRequires: jpackage-utils >= 0:1.7.3
BuildRequires: java-devel >= 0:1.5.0
BuildRequires: ant >= 0:1.6
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-release-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
@@ -70,7 +67,6 @@ BuildRequires: plexus-container-default
BuildRequires: plexus-utils
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
The Plexus project seeks to create end-to-end developer tools for
@@ -83,58 +79,34 @@ is like a J2EE application server, without all the baggage.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
%prep
%setup -q -n %{name}-%{namedversion}
-cp -p %{SOURCE3} settings.xml
-%patch0 -p1
%build
-sed -i -e
"s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g"
settings.xml
-sed -i -e
"s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g"
settings.xml
-sed -i -e
"s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g"
settings.xml
-sed -i -e
"s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g"
settings.xml
-sed -i -e
"s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g"
settings.xml
-
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
-mvn-jpp \
- -e \
- -s $(pwd)/settings.xml \
- -Dmaven2.jpp.mode=true \
- -Dmaven2.jpp.depmap.file=%{SOURCE4} \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
+ -Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/%{name}-%{namedversion}.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} 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%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.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}
-
-%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
@@ -143,17 +115,17 @@ rm -rf $RPM_BUILD_ROOT
%update_maven_depmap
%files
-%defattr(-,root,root,-)
%{_javadir}/%{parent}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Sun Jun 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-0.5.a7
+- Build with maven 3.x
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.0-0.4.a7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild