Fix FTBFS rhbz #914586
This commit is contained in:
parent
d393dca331
commit
941b22c66d
@ -1,6 +1,6 @@
|
|||||||
Name: xml-maven-plugin
|
Name: xml-maven-plugin
|
||||||
Version: 1.0
|
Version: 1.0
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: Maven XML Plugin
|
Summary: Maven XML Plugin
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
@ -14,6 +14,8 @@ BuildRequires: mojo-parent
|
|||||||
BuildRequires: apache-rat-plugin
|
BuildRequires: apache-rat-plugin
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
BuildRequires: maven-changes-plugin
|
BuildRequires: maven-changes-plugin
|
||||||
|
BuildRequires: maven-checkstyle-plugin
|
||||||
|
BuildRequires: maven-clean-plugin
|
||||||
BuildRequires: maven-compiler-plugin
|
BuildRequires: maven-compiler-plugin
|
||||||
BuildRequires: maven-enforcer-plugin
|
BuildRequires: maven-enforcer-plugin
|
||||||
BuildRequires: maven-install-plugin
|
BuildRequires: maven-install-plugin
|
||||||
@ -21,7 +23,6 @@ BuildRequires: maven-invoker-plugin
|
|||||||
BuildRequires: maven-jar-plugin
|
BuildRequires: maven-jar-plugin
|
||||||
BuildRequires: maven-javadoc-plugin
|
BuildRequires: maven-javadoc-plugin
|
||||||
BuildRequires: maven-plugin-testing-harness
|
BuildRequires: maven-plugin-testing-harness
|
||||||
BuildRequires: maven-surefire-plugin
|
|
||||||
BuildRequires: maven-plugin-cobertura
|
BuildRequires: maven-plugin-cobertura
|
||||||
|
|
||||||
BuildRequires: plexus-component-api
|
BuildRequires: plexus-component-api
|
||||||
@ -59,8 +60,13 @@ done
|
|||||||
rm -rf src/it/it8
|
rm -rf src/it/it8
|
||||||
rm -rf src/it/mojo-1438-validate
|
rm -rf src/it/mojo-1438-validate
|
||||||
|
|
||||||
|
# In maven 3, the functionality we need has been moved to maven-core
|
||||||
|
%pom_remove_dep org.apache.maven:maven-project
|
||||||
|
%pom_add_dep org.apache.maven:maven-core
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mvn-rpmbuild -DskipTests -Dmaven.test.skip=true -DskipITs install javadoc:aggregate
|
mvn-rpmbuild -Dmojo.java.target=1.5 -Dmaven.test.skip=true -DskipITs \
|
||||||
|
install javadoc:aggregate
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}%{_javadir}
|
mkdir -p %{buildroot}%{_javadir}
|
||||||
@ -87,6 +93,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/xml-maven-plugin
|
|||||||
%doc LICENSE.txt NOTICE.txt
|
%doc LICENSE.txt NOTICE.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 02 2013 Mat Booth <fedora@matbooth.co.uk> - 1.0-7
|
||||||
|
- Fix FTBFS rhbz #914586
|
||||||
|
|
||||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-6
|
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user