commit a5f77dda41571f19e6befea601622377572e05e7 Author: Stanislav Ochotnicky sochotnicky@redhat.com Date: Thu Feb 10 15:19:05 2011 +0100
Fix build
- Versionless jars & javadocs - Build with maven 3 - Remove old patch
plexus-maven-plugin-add-deps.patch | 54 ------------------------------------ plexus-maven-plugin.spec | 48 +++++++++++++------------------ 2 files changed, 20 insertions(+), 82 deletions(-) --- diff --git a/plexus-maven-plugin.spec b/plexus-maven-plugin.spec index e3c5802..7aa6c92 100644 --- a/plexus-maven-plugin.spec +++ b/plexus-maven-plugin.spec @@ -18,15 +18,12 @@ URL: http://plexus.codehaus.org/ # tar czf plexus-maven-plugin-1.3.8-src.tar.xz plexus-maven-plugin-1.3.8 Source0: %{name}-%{version}-src.tar.xz
-Patch0: %{name}-add-deps.patch -Patch1: %{name}-doxia.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: %{name}-doxia.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2 -BuildRequires: maven2 +BuildRequires: maven BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin @@ -60,6 +57,7 @@ from within Maven. %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation +Requires: jpackage-utils
%description javadoc Javadoc for %{name}. @@ -67,42 +65,31 @@ Javadoc for %{name}. %prep %setup -q %patch0 -p1 -%patch1 -p1
%build -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 \ - $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar -%add_to_maven_depmap org.codehaus.plexus %{name} 1.2 JPP/%{parent} %{subname} -(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \ - do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar +%add_to_maven_depmap org.codehaus.plexus %{name} %{version} 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} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* \ - $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ +%pre javadoc +# workaround for rpm bug, can be removed in F-17 +[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ +rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT
%post %update_maven_depmap @@ -118,9 +105,14 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc %defattr(-,root,root,-) -%doc %{_javadocdir}/* +%doc %{_javadocdir}/%{name}
%changelog +* Thu Feb 10 2011 Stanislav Ochotnicky sochotnicky@redhat.com - 0:1.3.8-4 +- Fix build +- Versionless jars & javadocs +- Build with maven 3 + * Wed Feb 09 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 0:1.3.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild