From ab281dcee9bcfa0c2fec620a4384f8ec6bab06c5 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Nov 21 2012 17:34:45 +0000 Subject: Update to upstream 0.6.0. --- diff --git a/.gitignore b/.gitignore index 7b9e349..5cd00ac 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /eclemma-v0.5.9.tar.gz /v0.5.9 /jacoco-jacoco-v0.5.10-0-gd3dd13c.tar.gz +/jacoco-0.6.0.tar.gz diff --git a/jacoco.spec b/jacoco.spec index 0beee40..d0de36e 100644 --- a/jacoco.spec +++ b/jacoco.spec @@ -1,14 +1,14 @@ -%global tag 201207300726 +%global tag 201210061924 Name: jacoco -Version: 0.5.9 -Release: 2%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: Java Code Coverage for Eclipse Group: System Environment/Libraries License: EPL URL: http://www.eclemma.org/jacoco/ -#https://github.com/jacoco/jacoco/tags -Source0: eclemma-v0.5.9.tar.gz +#https://github.com/jacoco/jacoco/archive/v0.6.0.tar.gz +Source0: https://github.com/jacoco/jacoco/archive/jacoco-0.6.0.tar.gz Patch0: removeGroovyScripting.patch #jacoco can't be build with maven 3. https://github.com/jacoco/jacoco/issues/21 @@ -62,7 +62,7 @@ Requires: %{name} = %{version}-%{release} A Jacoco plugin for maven. %prep -%setup -q -n v%{version} +%setup -q %patch0 -p3 %patch1 @@ -83,9 +83,7 @@ fi # right now. OPTIONS="-DrandomNumner=${RANDOM} clean package javadoc:aggregate" -pushd org.jacoco.build - mvn-rpmbuild $OPTIONS -popd +mvn-rpmbuild $OPTIONS dos2unix org.jacoco.doc/docroot/doc/.resources/doc.css @@ -119,7 +117,7 @@ done; # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -rf org.jacoco.build/target/site/* %{buildroot}%{_javadocdir}/%{name} +cp -rf target/site/* %{buildroot}%{_javadocdir}/%{name} %files %{_mavendepmapfragdir}/%{name} @@ -148,6 +146,9 @@ cp -rf org.jacoco.build/target/site/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name}/ %changelog +* Wed Nov 21 2012 Alexander Kurtakov 0.6.0-1 +- Update to upstream 0.6.0. + * Mon Sep 17 2012 Krzysztof Daniel 0.5.9-2 - Add BR to fest-assert. diff --git a/sources b/sources index a97b32b..03171a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c987a72fe7ac92da7cda786cbf709f45 eclemma-v0.5.9.tar.gz +0b423f66b8dd9b06013afd722b3bccf8 jacoco-0.6.0.tar.gz