[maven-help-plugin] Fix FTBFS.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Jun 13 12:22:17 UTC 2014
commit a64c4399870e62d235fe11bfb5a49988bc456022
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri Jun 13 15:22:11 2014 +0300
Fix FTBFS.
maven-help-plugin.spec | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
---
diff --git a/maven-help-plugin.spec b/maven-help-plugin.spec
index 9020831..b47abbe 100644
--- a/maven-help-plugin.spec
+++ b/maven-help-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-help-plugin
Version: 2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Plugin to to get relative information about a project or the system
Group: Development/Libraries
@@ -72,36 +72,21 @@ sed -i "s|PluginUtils.toText|org.apache.maven.tools.plugin.generator.GeneratorUt
src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
%build
-# Skip tests, there is some kind of dependency injection failure in one of them
-mvn-rpmbuild -DskipTests=true \
- install javadoc:javadoc
+%mvn_build -f
%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%files -f .mfiles
%doc LICENSE NOTICE
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
%changelog
+* Fri Jun 13 2014 Alexander Kurtakov <akurtako at redhat.com> 2.2-5
+- Fix FTBFS.
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list