rpms/weka/devel weka-3.6.2-build.xml.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 weka.spec, 1.2, 1.3

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/weka/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2633

Modified Files:
	.cvsignore sources weka.spec 
Added Files:
	weka-3.6.2-build.xml.patch 
Log Message:
- Update to 3.6.2
- Fix libsvm usage (resolves BZ#523684)
- Fix removing jars
- Added BR: jflex, java_cup >= 1:0.11a



weka-3.6.2-build.xml.patch:
 build.xml |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE weka-3.6.2-build.xml.patch ---
--- build.xml.orig	2010-01-16 17:30:19.000000000 +0100
+++ build.xml	2010-01-16 17:30:26.000000000 +0100
@@ -90,11 +90,6 @@
     </copy>
     <rmic base="${build}/classes"
        classname="weka.experiment.RemoteEngine"/>
-    <unzip src="${lib}/java-cup.jar" dest="${build}/classes">
-      <patternset>
-        <include name="java_cup/runtime/**/*"/>
-      </patternset>
-    </unzip>
   </target>
 
   <!-- Make the javadocs -->


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/weka/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Mar 2009 12:18:30 -0000	1.2
+++ .cvsignore	17 Jan 2010 20:12:26 -0000	1.3
@@ -1 +1 @@
-weka-3-6-0.zip
+weka-3-6-2.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/weka/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Mar 2009 12:18:30 -0000	1.2
+++ sources	17 Jan 2010 20:12:26 -0000	1.3
@@ -1 +1 @@
-a782afc9b2a84ed34db4e631545955f5  weka-3-6-0.zip
+a065b9bc25458833970f6bca3f84785a  weka-3-6-2.zip


Index: weka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/weka/devel/weka.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- weka.spec	27 Jul 2009 07:09:58 -0000	1.2
+++ weka.spec	17 Jan 2010 20:12:27 -0000	1.3
@@ -1,4 +1,4 @@
-%global _version 3-6-0
+%global _version 3-6-2
 
 # whether to run jUnit tests, caution: takes horribly long
 # currently disabled as the tests fail, filed in upstream's bugtracker:
@@ -6,16 +6,16 @@
 # %%global _with_tests 1
 
 Name:			weka
-Version:		3.6.0
-Release:		4%{?dist}
+Version:		3.6.2
+Release:		1%{?dist}
 Summary:		Waikato Environment for Knowledge Analysis
 
 Group:			Applications/Engineering
 License:		GPLv2+
 URL:			http://www.cs.waikato.ac.nz/ml/%{name}/
 Source0:		http://downloads.sourceforge.net/%{name}/%{name}-%{_version}.zip
-# wrapper script:
 Source1:		weka.desktop
+Patch0:			weka-3.6.2-build.xml.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:		noarch
 
@@ -25,6 +25,8 @@ BuildRequires:	ant
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
 BuildRequires:	junit
+BuildRequires:	jflex
+BuildRequires:	java_cup >= 1:0.11a
 
 Requires:		java >= 1:1.6.0
 Requires:		jpackage-utils
@@ -49,17 +51,19 @@ This package contains the API documentat
 %setup -q -n %{name}-%{_version}
 # unzip the sources jar
 unzip %{name}-src.jar
+%patch0
 # remove prebuilt jars
-find -name '*.jar' -o -name '*.class' -delete
+find -name '*.jar' -delete -o -name '*.class' -delete
 # we won't run JUnit tests and 128m for making javadocs was not enough:(
 sed -i -e 's/name="lib" value="lib"/name="lib" value="src"/' -e 's/maxmemory="128m"/maxmemory="256m"/' build.xml
 
 %build
+export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex)
 ant compile
 
 %if %{?_with_tests:1}%{!?_with_tests:0}
 %check
-CLASSPATH=/usr/share/java/junit.jar ant run_tests
+export CLASSPATH=/usr/share/java/junit.jar ant run_tests
 %endif
 
 %install
@@ -82,6 +86,7 @@ cat > $RPM_BUILD_ROOT%{_bindir}/%{name} 
 	. /usr/share/java-utils/java-functions
 	MAIN_CLASS="weka.gui.GUIChooser"
 	set_classpath "weka.jar"
+	set_classpath "libsvm.jar"
 	run "$@"
 EOF
 chmod a+x $RPM_BUILD_ROOT%{_bindir}/%{name}
@@ -127,6 +132,12 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Jan 16 2010 Milos Jakubicek <xjakub at fi.muni.cz> - 3.6.2-1
+- Update to 3.6.2
+- Fix libsvm usage (resolves BZ#523684)
+- Fix removing jars
+- Added BR: jflex, java_cup >= 1:0.11a
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild