rpms/gant/EL-6 gant-1.8.1-groovy7.patch, NONE, 1.1 gant-script, NONE, 1.1 import.log, NONE, 1.1 gant.spec, 1.1, 1.2

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/gant/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12637/EL-6

Modified Files:
	gant.spec 
Added Files:
	gant-1.8.1-groovy7.patch gant-script import.log 
Log Message:
Pull from devel

gant-1.8.1-groovy7.patch:
 Include_Test.groovy |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gant-1.8.1-groovy7.patch ---
Fix up a test so that it passes with groovy 1.7.0.

diff -urp gant-1.8.1/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy gant-1.8.1.fixed/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy
--- gant-1.8.1/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy	2009-10-02 13:19:23.000000000 +0200
+++ gant-1.8.1.fixed/src/test/groovy/org/codehaus/gant/tests/Include_Test.groovy	2010-03-04 09:37:50.040561684 +0100
@@ -555,7 +555,7 @@ target ( ${something} : '' ) { }
 """
     assertEquals ( -4 , processCmdLineTargets ( something ) )
     assertEquals ( '' , output )
-    assertEquals ( 'Standard input, line 2 -- Error evaluating Gantfile: No signature of method: org.codehaus.gant.IncludeTargets.multiply() is applicable for argument types: (java.lang.Class) values: ' + ( ( groovyMinorVersion < 6 ) ? '{class gant.targets.Clean}' : '[class gant.targets.Clean]' ) + '\n' , error )
+    assertEquals ( 'Standard input, line 2 -- Error evaluating Gantfile: No signature of method: org.codehaus.gant.IncludeTargets.multiply() is applicable for argument types: (java.lang.Class) values: ' + ( ( groovyMinorVersion < 7 ) ? '[class gant.targets.Clean]' : '[class gant.targets.Clean]\nPossible solutions: multiply(java.util.Map), multiply(java.util.Map)' ) + '\n' , error )
   }
   void testErrorNullPower ( ) {
     script = """


--- NEW FILE gant-script ---
#!/bin/sh
# 
# Gant startup script
# Lubomir Rintel <lkundrak at v3.sk>

BASE_JARS="$BASE_JARS gant"
BASE_JARS="$BASE_JARS ../../lib/jvm/java/lib/tools"
CLASS=gant.Gant
. "$(dirname "$0")"/groovy


--- NEW FILE import.log ---
gant-1_8_1-4_fc14:EL-6:gant-1.8.1-4.fc14.src.rpm:1278621881


Index: gant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gant/EL-6/gant.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gant.spec	9 Dec 2009 18:20:04 -0000	1.1
+++ gant.spec	8 Jul 2010 20:45:10 -0000	1.2
@@ -1,7 +1,7 @@
 %global build_jars                                                \\\
         -DgroovyJar=%(          build-classpath groovy          ) \\\
         -Dcommons-cliJar=%(     build-classpath commons-cli     ) \\\
-        -Dasm2Jar=%(            build-classpath asm2/asm2       ) \\\
+        -Dasm2Jar=%(            build-classpath objectweb-asm/asm ) \\\
         -DantlrJar=%(           build-classpath antlr           ) \\\
         -DantJar=%(             build-classpath ant             ) \\\
         -DjunitJar=%(           build-classpath junit           ) \\\
@@ -11,27 +11,31 @@
 
 Name:           gant
 Version:        1.8.1
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Groovy-based build system that uses Ant tasks
 
 Group:          Development/Tools
 License:        ASL 2.0
 URL:            http://gant.codehaus.org/
 Source0:        http://dist.codehaus.org/gant/distributions/gant_src-%{version}.tgz
+Source1:        gant-script
 Patch0:         0001-Make-it-build-against-our-jars.patch
 Patch1:         0001-Fix-tests.patch
+Patch2:         gant-1.8.1-groovy7.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  groovy
 BuildRequires:  jakarta-commons-cli
-BuildRequires:  asm2
+BuildRequires:  objectweb-asm
 BuildRequires:  antlr
 BuildRequires:  ant
 BuildRequires:  junit
 BuildRequires:  ant-junit
 BuildRequires:  ivy
+BuildRequires:  java-devel-openjdk
 BuildRequires:  jpackage-utils
 Requires:       jpackage-utils
+Requires:       groovy
 
 BuildArch:      noarch
 
@@ -49,6 +53,7 @@ specify the rules.
 %setup -q
 %patch0 -p1 -b .build
 %patch1 -p1 -b .tests
+%patch2 -p1 -b .groovy7
 
 
 %build
@@ -62,6 +67,16 @@ install -d $RPM_BUILD_ROOT%{_javadir}
 install -p -m0644 target_gant/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m644 documentation/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+install -p -m644 scripts/bash_completion.d/%{name} \
+        $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/gant
+
 
 %check
 
@@ -76,7 +91,7 @@ mkdir -p .gant/cache
 ant %{build_jars} test
 
 # Ant always returns success, let us look at the test reports ourselves
-if FAILED=$(egrep -l 'errors="[^0]"|failures="[^0]"' \
+if FAILED=$(egrep -l 'errors="[^0]|failures="[^0]' \
         target_gant/test-reports/*.xml)
 then
         echo $FAILED |sed 's/\.xml/.txt/' |xargs cat
@@ -90,10 +105,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/*
 %{_javadir}/*.jar
+%{_mandir}/man1/%{name}.1*
+%config %{_sysconfdir}/bash_completion.d
 %doc README_Install.txt LICENCE.txt releaseNotes.txt
 
 
 %changelog
+* Fri Mar 5 2010 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-4
+- Include JDK tools in classpath
+
+* Thu Mar 4 2010 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-3
+- Fix build with Groovy 1.7
+
+* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-2
+- Add manual
+- Add bash completion configuration
+- Add startup script
+
 * Mon Nov 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.8.1-1
 - Initial packaging