[jacoco] - Package correct agent. - Improve the name of packages.

[Krzysztof Daniel]

commit 2aa0622cee717b29a6f6036de7135384bb719026
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Thu Dec 6 12:04:20 2012 +0100

    - Package correct agent.
    - Improve the name of packages.

 .gitignore  |    1 +
 jacoco.spec |   14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5cd00ac..bf81f87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /v0.5.9
 /jacoco-jacoco-v0.5.10-0-gd3dd13c.tar.gz
 /jacoco-0.6.0.tar.gz
+/jacoco-0.6.0
diff --git a/jacoco.spec b/jacoco.spec
index 5e42424..07ae70d 100644
--- a/jacoco.spec
+++ b/jacoco.spec
@@ -2,7 +2,7 @@
 
 Name:      jacoco
 Version:   0.6.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Java Code Coverage for Eclipse 
 Group:     System Environment/Libraries
 License:   EPL
@@ -56,7 +56,7 @@ Summary:    A Jacoco plugin for maven
 Group:      System Environment/Libraries
 Requires:   java
 Requires:   maven
-Requires:   objectweb-asm
+Requires:   objectweb-asm4
 Requires:   %{name} = %{version}-%{release}
 
 %description maven-plugin
@@ -85,7 +85,7 @@ fi
 %build
 # Note: Tests must be disabled because they introduce circular dependency
 # right now.
-OPTIONS="-DrandomNumner=${RANDOM}  clean package javadoc:aggregate" 
+OPTIONS="-Dmaven.local.mode=true -DrandomNumber=${RANDOM}  clean package javadoc:aggregate" 
 
 mvn-rpmbuild $OPTIONS
 
@@ -104,7 +104,9 @@ do
     cp $f/target/$f-%{version}.%{tag}.jar %{buildroot}%{_javadir}/%{name}/$f.jar
 done;
 
-# Intsall maven stuff.
+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
@@ -150,6 +152,10 @@ cp -rf target/site/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}/
 
 %changelog
+* Thu Nov 29 2012 Krzysztof Daniel <kdaniel at redhat.com> 0.6.0-2
+- Package correct agent.
+- Improve the name of packages.
+
 * Wed Nov 21 2012 Alexander Kurtakov <akurtako at redhat.com> 0.6.0-1
 - Update to upstream 0.6.0.