[jacoco] Migrate to %mvn_install
Michal Srb
msrb at fedoraproject.org
Fri Jun 13 13:16:32 UTC 2014
commit 7141e47f4bd20b5eade580fb431ab34d134002cd
Author: Michal Srb <msrb at redhat.com>
Date: Fri Jun 13 14:56:28 2014 +0200
Migrate to %mvn_install
jacoco.spec | 98 +++++++++++++++++++---------------------------------------
1 files changed, 32 insertions(+), 66 deletions(-)
---
diff --git a/jacoco.spec b/jacoco.spec
index 987fec6..8d7e799 100644
--- a/jacoco.spec
+++ b/jacoco.spec
@@ -2,7 +2,7 @@
Name: jacoco
Version: 0.7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java Code Coverage for Eclipse
Group: System Environment/Libraries
License: EPL
@@ -13,23 +13,27 @@ Patch0: removeUselessBuildParts.patch
BuildArch: noarch
-BuildRequires: java-devel
-BuildRequires: javapackages-tools
-BuildRequires: eclipse-platform >= 1:4.2.0-0.10
-BuildRequires: eclipse-pde >= 1:4.2.0-0.10
-BuildRequires: tycho
-BuildRequires: maven-shade-plugin >= 1.5
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-dependency-plugin maven-antrun-plugin maven-assembly-plugin maven-clean-plugin maven-compiler-plugin maven-deploy-plugin
-BuildRequires: maven-install-plugin maven-invoker-plugin maven-gpg-plugin maven-jar-plugin maven-javadoc-plugin maven-plugin-plugin
-BuildRequires: maven-release-plugin maven-resources-plugin maven-shade-plugin maven-source-plugin maven-surefire-plugin maven-site-plugin
-BuildRequires: maven-plugin-tools-javadoc
-BuildRequires: maven-plugin-build-helper
-BuildRequires: dos2unix
-BuildRequires: objectweb-asm
-Requires: java-headless >= 1.7
-Requires: ant
-Requires: objectweb-asm
+BuildRequires: maven-local
+BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
+BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-javadoc)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
+BuildRequires: mvn(org.apache.maven.shared:file-management)
+BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(org.jacoco:org.jacoco.build:pom:)
+BuildRequires: mvn(org.ow2.asm:asm-debug-all)
+BuildRequires: dos2unix
+
%description
JaCoCo is a free code coverage library for Java,
@@ -39,20 +43,12 @@ from using and integration existing libraries over the last five years.
%package javadoc
Summary: Java-docs for %{name}
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-Requires: javapackages-tools
%description javadoc
This package contains the API documentation for %{name}.
%package maven-plugin
Summary: A Jacoco plugin for maven
-Group: System Environment/Libraries
-Requires: java-headless
-Requires: maven
-Requires: objectweb-asm
-Requires: %{name} = %{version}-%{release}
%description maven-plugin
A Jacoco plugin for maven.
@@ -66,65 +62,35 @@ A Jacoco plugin for maven.
%pom_disable_module ../org.jacoco.tests org.jacoco.build
%pom_disable_module ../jacoco org.jacoco.build
+%mvn_package ":jacoco-maven-plugin:{jar,pom}:{}:" maven-plugin
+%mvn_package ":{org.}*:{jar,pom}:runtime:"
+
%build
%mvn_build
dos2unix org.jacoco.doc/docroot/doc/.resources/doc.css
%install
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-
-for f in org.jacoco.agent \
- org.jacoco.ant \
- org.jacoco.core \
- org.jacoco.report
-do
- cp $f/target/$f-%{version}.%{tag}.jar %{buildroot}%{_javadir}/%{name}/$f.jar
-done;
-
-cp org.jacoco.agent.rt/target/org.jacoco.agent.rt-%{version}.%{tag}-all.jar %{buildroot}%{_javadir}/%{name}/org.jacoco.agent.rt.jar
-
-# Install maven stuff.
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 org.jacoco.build/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom
-
-for f in org.jacoco.agent \
- org.jacoco.agent.rt \
- org.jacoco.ant \
- org.jacoco.core \
- org.jacoco.report
-do
- install -pm 644 $f/pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}-$f.pom
- %add_maven_depmap JPP.%{name}-$f.pom %{name}/$f.jar
-done;
-
-# maven plugin
-cp jacoco-maven-plugin/target/jacoco-maven-plugin-%{version}.%{tag}.jar %{buildroot}%{_javadir}/jacoco-maven-plugin.jar
-install -pm 644 jacoco-maven-plugin/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-jacoco-maven-plugin.pom
-%add_maven_depmap JPP-jacoco-maven-plugin.pom jacoco-maven-plugin.jar -f plugin
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rf target/site/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
# ant config
mkdir -p %{buildroot}%{_sysconfdir}/ant.d
echo %{name} %{name}/org.jacoco.ant > %{buildroot}%{_sysconfdir}/ant.d/%{name}
%files -f .mfiles
+%dir %{_javadir}/%{name}
%config(noreplace) %{_sysconfdir}/ant.d/%{name}
%doc org.jacoco.doc/docroot/*
%doc org.jacoco.doc/about.html
-%files maven-plugin -f .mfiles-plugin
-%{_javadir}/jacoco-maven-plugin.jar
-%{_mavenpomdir}/JPP-jacoco-maven-plugin.pom
+%files maven-plugin -f .mfiles-maven-plugin
-%files javadoc
-%{_javadocdir}/%{name}/
+%files javadoc -f .mfiles-javadoc
%changelog
+* Fri Jun 13 2014 Michal Srb <msrb at redhat.com> - 0.7.1-5
+- Migrate to %%mvn_install
+
* Mon Jun 9 2014 Alexander Kurtakov <akurtako at redhat.com> 0.7.1-4
- Fix FTBFS.
More information about the scm-commits
mailing list