dist-git conversion

build

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: weka
-# $Id$
-NAME := weka
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1 +0,0 @@
-weka-3_6_0-3_fc10:HEAD:weka-3.6.0-3.fc10.src.rpm:1235909856

sources

@@ -1 +1 @@
-a782afc9b2a84ed34db4e631545955f5  weka-3-6-0.zip
+a065b9bc25458833970f6bca3f84785a  weka-3-6-2.zip

weka-3.6.2-build.xml.patch

@@ -0,0 +1,14 @@
+--- 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 -->

weka.spec

@@ -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,7 +6,7 @@
 # %%global _with_tests 1
 
 Name:			weka
-Version:		3.6.0
+Version:		3.6.2
 Release:		4%{?dist}
 Summary:		Waikato Environment for Knowledge Analysis
 
@@ -14,9 +14,10 @@ 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)
+ExcludeArch:	ppc ppc64
 BuildArch:		noarch
 
 BuildRequires:	java-devel >= 1:1.6.0
@@ -25,9 +26,17 @@ 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
+Requires:		libsvm-java
+Requires:		java_cup
+Requires:		hsqldb
+Requires:		postgresql-jdbc
+Requires:		mysql-connector-java
+Requires:		javasqlite
 
 %description
 Weka is a collection of machine learning algorithms for data mining tasks.
@@ -49,17 +58,19 @@ This package contains the API documentation for %{name}.
 %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 +93,12 @@ cat > $RPM_BUILD_ROOT%{_bindir}/%{name} <<-EOF
 	. /usr/share/java-utils/java-functions
 	MAIN_CLASS="weka.gui.GUIChooser"
 	set_classpath "weka.jar"
+	set_classpath "libsvm.jar"
+	set_classpath "java_cup.jar"
+	set_classpath "postgresql-jdbc"
+	set_classpath "hsqldb"
+	set_classpath "mysql-connector-java"
+	export CLASSPATH="\$CLASSPATH:%{_libdir}/javasqlite/sqlite.jar"
 	run "$@"
 EOF
 chmod a+x $RPM_BUILD_ROOT%{_bindir}/%{name}
@@ -127,6 +144,25 @@ fi
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon May 03 2010 Miloš Jakubíček <xjakub@fi.muni.cz> - 3.6.2-4
+- Fix typo causing $CLASSPATH in %%{_bindir}/weka to be expanded during the build
+
+* Fri Apr 30 2010 Miloš Jakubíček <xjakub@fi.muni.cz> - 3.6.2-3
+- java_cup, hsqldb, postgresql-jdbc, mysql-connector-java, sqlite added to CLASSPATH and required
+  (resolve BZ#587596)
+
+* Thu Mar 23 2010 Miloš Jakubíček <xjakub@fi.muni.cz> - 3.6.2-2.fc12.1
+- libsvm-java got obsoleted in F12 ppc/ppc64, therefore we ExcludeArch those
+
+* Wed Mar 03 2010 Miloš Jakubíček <xjakub@fi.muni.cz> - 3.6.2-2
+- Added Requires: libsvm-java (BZ#523684)
+
+* Sat Jan 16 2010 Milos Jakubicek <xjakub@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@lists.fedoraproject.org> - 3.6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild