commit 695298205694d5a6eba15d5e0702e31fb8fd27be Author: Alexander Kurtakov akurtakov@gmail.com Date: Sun Jun 12 14:47:32 2011 +0300
Build with maven 3.x
plexus-digest.spec | 41 +++++++++++++---------------------------- 1 files changed, 13 insertions(+), 28 deletions(-) --- diff --git a/plexus-digest.spec b/plexus-digest.spec index e26f90b..a580205 100644 --- a/plexus-digest.spec +++ b/plexus-digest.spec @@ -33,7 +33,7 @@
Name: plexus-digest Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: Plexus Digest / Hashcode Components License: ASL 2.0 @@ -47,15 +47,14 @@ BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2 BuildRequires: ant >= 0:1.6 -BuildRequires: maven2 >= 2.0.4-9 +BuildRequires: maven 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-plugin BuildRequires: maven-surefire-provider-junit -BuildRequires: maven2-common-poms >= 1.0 BuildRequires: maven-doxia BuildRequires: maven-doxia-sitetools BuildRequires: qdox >= 1.5 @@ -87,19 +86,9 @@ Javadoc for %{name}. %setup -q -n %{name}
%build -mkdir external_repo -ln -s %{_javadir} external_repo/JPP - -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL - -mvn-jpp \ - -e \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - install javadoc:javadoc +mvn-rpmbuild install javadoc:javadoc
%install -rm -rf $RPM_BUILD_ROOT # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus install -pm 644 target/*.jar \ @@ -107,17 +96,13 @@ install -pm 644 target/*.jar \ %add_to_maven_depmap org.codehaus.plexus %{name} 1.0 JPP/%{parent} %{subname}
# pom -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} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%post %update_maven_depmap @@ -126,16 +111,17 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %update_maven_depmap
%files -%defattr(-,root,root,-) %{_javadir}/plexus/* -%{_mavenpomdir} -%{_mavendepmapfragdir} +%{_mavenpomdir}/* +%{_mavendepmapfragdir}/*
%files javadoc -%defattr(-,root,root,-) %doc %{_javadocdir}/*
%changelog +* Sun Jun 12 2011 Alexander Kurtakov akurtako@redhat.com 0:1.1-4 +- Build with maven 3.x + * Wed Feb 09 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 0:1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -184,4 +170,3 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
* Wed Nov 14 2007 Ralph Apel <r.apel @ r-apel.de> - 0:1.0-1jpp - Initial build -