Add comment for removing javadoc
- Fix maven 3 build
This commit is contained in:
parent
0d21c6692a
commit
8c750591d2
14
xbean.spec
14
xbean.spec
@ -2,7 +2,7 @@ Name: xbean
|
||||
Version: 3.7
|
||||
BuildArch: noarch
|
||||
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Summary: Java plugin based web server
|
||||
|
||||
Group: Development/Libraries
|
||||
@ -36,7 +36,7 @@ BuildRequires: maven-javadoc-plugin
|
||||
BuildRequires: maven-resources-plugin
|
||||
BuildRequires: maven-surefire-maven-plugin
|
||||
BuildRequires: maven-site-plugin
|
||||
BuildRequires: maven2-plugin-shade
|
||||
BuildRequires: maven-shade-plugin
|
||||
|
||||
Requires: java
|
||||
Requires: objectweb-asm
|
||||
@ -103,7 +103,12 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-main.pom
|
||||
%add_to_maven_depmap org.apache.xbean %{name} %{version} JPP/%{name} main
|
||||
|
||||
# UGLY hack to fix maven without 2 rebuilds
|
||||
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven/lib/ext
|
||||
|
||||
|
||||
%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} || :
|
||||
|
||||
@ -119,6 +124,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
||||
%{_mavenpomdir}/*.pom
|
||||
%{_mavendepmapfragdir}/%{name}
|
||||
%{_javadir}/%{name}
|
||||
%{_datadir}/maven/lib/ext
|
||||
|
||||
%files javadoc
|
||||
%defattr(-,root,root,-)
|
||||
@ -126,6 +132,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Fri Mar 4 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-6
|
||||
- Add comment for removing javadoc
|
||||
- Fix maven 3 build
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.7-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user