[jacoco/f18: 7/7] Merge branch 'master' into f18

[Krzysztof Daniel]

commit 7d0330a6e3bdfd38195f6bc9b6f483a6886faaf2
Merge: ca1e559 2aa0622
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Dec 10 11:55:06 2012 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	jacoco.spec

 .gitignore  |    2 ++
 jacoco.spec |   43 ++++++++++++++++++++++++++-----------------
 sources     |    2 +-
 3 files changed, 29 insertions(+), 18 deletions(-)
---
diff --cc jacoco.spec
index e03b932,07ae70d..3dbb9bc
--- a/jacoco.spec
+++ b/jacoco.spec
@@@ -1,8 -1,8 +1,8 @@@
- %global tag 201207300726
+ %global tag 201210061924
  
  Name:      jacoco
- Version:   0.5.9
+ Version:   0.6.0
 -Release:   2%{?dist}
 +Release:   3%{?dist}
  Summary:   Java Code Coverage for Eclipse 
  Group:     System Environment/Libraries
  License:   EPL
@@@ -81,11 -85,9 +85,9 @@@ f
  %build
  # Note: Tests must be disabled because they introduce circular dependency
  # right now.
- OPTIONS="-DrandomNumner=${RANDOM} -DskipTychoVersionCheck clean package javadoc:aggregate" 
 -OPTIONS="-Dmaven.local.mode=true -DrandomNumber=${RANDOM}  clean package javadoc:aggregate" 
++OPTIONS="-DrandomNumber=${RANDOM} -DskipTychoVersionCheck clean package javadoc:aggregate" 
  
- pushd org.jacoco.build
-     mvn-rpmbuild $OPTIONS
- popd
+ mvn-rpmbuild $OPTIONS
  
  dos2unix org.jacoco.doc/docroot/doc/.resources/doc.css 
  
@@@ -149,11 -152,15 +151,18 @@@ cp -rf target/site/* %{buildroot}%{_jav
  %{_javadocdir}/%{name}/
  
  %changelog
- * Fri Dec 7 2012 Krzysztof Daniel <kdaniel at redhat.com> 0.5.9-3
- - Resolve build issues (BR: fest-assert + ignore tycho version check).
++* Mon Dec 10 2012 Krzysztof Daniel <kdaniel at redhat.com> 0.6.0-3
++- Merge the master branch in.
++
+ * 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.
  
- * Fri Dec 7 2012 Krzysztof Daniel <kdaniel at redhat.com> 0.5.9-2
- - Package proper runtime agent.
+ * Mon Sep 17 2012 Krzysztof Daniel <kdaniel at redhat.com> 0.5.9-2
+ - Add BR to fest-assert.
  
  * Tue Sep 11 2012 Krzysztof Daniel <kdaniel at redhat.com> 0.5.9-1
  - Update to upstream 0.5.10 release.