[groovy: 3/3] Merge branch 'f19'

[Matt Spaulding]

commit 747d639596776a5b22b01630aa098bd6fb2cf85a
Merge: 2887950 eba2bc5
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Sun Aug 18 16:10:24 2013 -0700

    Merge branch 'f19'
    
    Conflicts:
    	groovy.spec

 groovy-script |    6 +++++-
 groovy.spec   |    5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc groovy.spec
index 8d55850,ddde47c..df6fce1
--- a/groovy.spec
+++ b/groovy.spec
@@@ -4,7 -4,7 +4,7 @@@
  
  Name:           groovy
  Version:        1.8.9
--Release:        4%{?dist}
++Release:        5%{?dist}
  Summary:        Dynamic language for the Java Platform
  
  Group:          Development/Languages
@@@ -168,9 -168,9 +168,12 @@@ install -p -m644 pom.xml $RPM_BUILD_ROO
  %doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
  
  %changelog
 -* Sat Aug 17 2013 Matt Spaulding <mspaulding06 at gmail.com> - 1.8.9-4
++* Sat Aug 18 2013 Matt Spaulding <mspaulding06 at gmail.com> - 1.8.9-5
+ - Fix setting classpath (RHBZ#982378)
+ 
 +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.9-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +
  * Mon Jun 10 2013 Michal Srb <msrb at redhat.com> - 1.8.9-3
  - Fix license tag (+CC-BY)