[jacoco/f19] - Move maven plugin to the %%{javadir}. - Move plugin artifact to plugin subpackage - Resolves: rhbz

[Krzysztof Daniel]

commit 54a63aa76a9953e1ea4bade77752eeed9bebfdd3
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Jul 22 20:42:36 2013 +0200

    - Move maven plugin to the %%{javadir}.
    - Move plugin artifact to plugin subpackage
    - Resolves: rhbz#987084

 jacoco.spec |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/jacoco.spec b/jacoco.spec
index 2c58b4a..68c1c38 100644
--- a/jacoco.spec
+++ b/jacoco.spec
@@ -2,7 +2,7 @@
 
 Name:      jacoco
 Version:   0.6.3
-Release:   2%{?dist}
+Release:   4%{?dist}
 Summary:   Java Code Coverage for Eclipse 
 Group:     System Environment/Libraries
 License:   EPL
@@ -96,8 +96,7 @@ install -d -m 755 %{buildroot}%{_javadir}/%{name}
 for f in    org.jacoco.agent \
             org.jacoco.ant \
             org.jacoco.core \
-            org.jacoco.report \
-            jacoco-maven-plugin
+            org.jacoco.report
 do
     cp $f/target/$f-%{version}.%{tag}.jar %{buildroot}%{_javadir}/%{name}/$f.jar
 done;
@@ -108,17 +107,22 @@ cp org.jacoco.agent.rt/target/org.jacoco.agent.rt-%{version}.%{tag}-all.jar %{bu
 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 \
-            jacoco-maven-plugin
+            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}
@@ -143,13 +147,21 @@ cp -rf target/site/* %{buildroot}%{_javadocdir}/%{name}
 %doc org.jacoco.doc/about.html
 
 %files maven-plugin
-%{_javadir}/%{name}/jacoco-maven-plugin.jar
-%{_mavenpomdir}/JPP.%{name}-jacoco-maven-plugin.pom
+%{_mavendepmapfragdir}/%{name}-plugin
+%{_javadir}/jacoco-maven-plugin.jar
+%{_mavenpomdir}/JPP-jacoco-maven-plugin.pom
 
 %files javadoc
 %{_javadocdir}/%{name}/
 
 %changelog
+* Mon Jul 22 2013 Krzysztof Daniel <kdaniel at redhat.com> 0.6.3-4
+- Move maven plugin to the %%{javadir}.
+
+* Mon Jul 22 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.6.3-3
+- Move plugin artifact to plugin subpackage
+- Resolves: rhbz#987084
+
 * Thu Jun 20 2013 Krzysztof Daniel <kdaniel at redhat.com> 0.6.3-2
 - Add missing BR.