fixed maven depmap (now using shortname instead name)

This commit is contained in:
Sandro Mathys 2010-05-23 21:44:48 +00:00
parent b0b6e5b18c
commit 4b5f612621
1 changed files with 4 additions and 8 deletions

View File

@ -51,10 +51,6 @@ Group: Documentation
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
# Upstream name change
Provides: jakarta-%{shortname}-javadoc = %{version}-%{release}
Obsoletes: jakarta-%{shortname}-javadoc < 1.0-2
%description javadoc
Development documentation for %{name}.
@ -86,7 +82,7 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# pomfile
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{shortname}.pom
%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
%add_to_maven_depmap org.apache.maven %{shortname} %{version} JPP %{shortname}
@ -119,11 +115,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu May 13 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-5
- Added missing Provides/Obsoletes for javadocs
* Sun May 23 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-5
* Fixed Maven depmap to use commons-compress
* Mon May 10 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-4
- Cleared some problems after the review
* Cleared some problems after the review
* Thu May 06 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-3
- Now using maven2 (mvn-jpp) instead of directly calling javac & co