Attachment 586049 Details for Bug 823914 – Proposed patch to the weka package

[patch] Proposed patch to the weka package

weka.diff (text/plain), 7.39 KB, created by Mary Ellen Foster on 2012-05-22 14:34:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mary Ellen Foster

Created: 2012-05-22 14:34:58 UTC

Size: 7.39 KB

patch

obsolete

>diff --git fedora/.gitignore mef/.gitignore
>index b857a4c..3678b7b 100644
>--- fedora/.gitignore
>+++ mef/.gitignore
>@@ -1 +1,2 @@
> weka-3-6-2.zip
>+/weka-3-7-6.zip
>diff --git fedora/sources mef/sources
>index 42d2aaa..a8a63a0 100644
>--- fedora/sources
>+++ mef/sources
>@@ -1 +1 @@
>-a065b9bc25458833970f6bca3f84785a  weka-3-6-2.zip
>+96fa16cedb19914826387e21036bd3bb  weka-3-7-6.zip
>diff --git fedora/weka-3.6.2-build.xml.patch mef/weka-3.6.2-build.xml.patch
>deleted file mode 100644
>index ecb1ba3..0000000
>--- fedora/weka-3.6.2-build.xml.patch
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- 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>
>- 
>-   
>diff --git fedora/weka-3.7.6-DefaultPackage-ascii.patch mef/weka-3.7.6-DefaultPackage-ascii.patch
>new file mode 100644
>index 0000000..65dd93b
>--- /dev/null
>+++ mef/weka-3.7.6-DefaultPackage-ascii.patch
>@@ -0,0 +1,11 @@
>+--- src/main/java/org/pentaho/packageManagement/DefaultPackage.java.orig	2012-05-22 14:19:54.810918897 +0100
>++++ src/main/java/org/pentaho/packageManagement/DefaultPackage.java	2012-05-22 14:19:57.243910466 +0100
>+@@ -716,7 +716,7 @@
>+   /**
>+    * Returns true if this package is already installed
>+    * 
>+-   * ²@return true if this package is installed
>++   * @return true if this package is installed
>+    */
>+   public boolean isInstalled() {
>+     File packageDir = new File(m_packageHome.getAbsoluteFile() + File.separator
>diff --git fedora/weka-3.7.6-pom_xml.patch mef/weka-3.7.6-pom_xml.patch
>new file mode 100644
>index 0000000..22b82cb
>--- /dev/null
>+++ mef/weka-3.7.6-pom_xml.patch
>@@ -0,0 +1,30 @@
>+--- pom.xml.orig	2012-05-22 14:41:22.622810638 +0100
>++++ pom.xml	2012-05-22 14:41:41.357750009 +0100
>+@@ -5,7 +5,7 @@
>+ 
>+   <groupId>nz.ac.waikato.cms.weka</groupId>
>+   <artifactId>weka-dev</artifactId>
>+-  <version>3.7.6-SNAPSHOT</version>
>++  <version>3.7.6</version>
>+   <packaging>jar</packaging>
>+ 
>+   <name>weka-dev</name>
>+@@ -103,16 +103,10 @@
>+     </dependency>
>+ 
>+     <dependency>
>+-      <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
>+-      <artifactId>java-cup</artifactId>
>++      <groupId>java_cup</groupId>
>++      <artifactId>java_cup</artifactId>
>+       <version>0.11a</version>
>+     </dependency>    
>+-
>+-    <dependency>
>+-      <groupId>org.pentaho.pentaho-commons</groupId>
>+-      <artifactId>pentaho-package-manager</artifactId>
>+-      <version>1.0.0</version>
>+-    </dependency>
>+   </dependencies>
>+ 
>+   <properties>
>diff --git fedora/weka.spec mef/weka.spec
>index 31f1b40..3b31022 100644
>--- fedora/weka.spec
>+++ mef/weka.spec
>@@ -1,27 +1,23 @@
>-%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:
>-# https://sourceforge.net/tracker2/?func=detail&aid=2648813&group_id=5091&atid=105091
>-# %%global _with_tests 1
>+%global _version 3-7-6
> 
> Name:			weka
>-Version:		3.6.2
>-Release:		6%{?dist}
>+Version:		3.7.6
>+Release:		1%{?dist}
> Summary:		Waikato Environment for Knowledge Analysis
> 
> Group:			Applications/Engineering
>-License:		GPLv2+
>+License:		GPLv3
> URL:			http://www.cs.waikato.ac.nz/ml/%{name}/
> Source0:		http://downloads.sourceforge.net/%{name}/%{name}-%{_version}.zip
> Source1:		weka.desktop
>-Patch0:			weka-3.6.2-build.xml.patch
>-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+Patch0:			weka-3.7.6-pom_xml.patch
>+Patch1:			weka-3.7.6-DefaultPackage-ascii.patch
> BuildArch:		noarch
> 
> BuildRequires:	java-devel >= 1:1.6.0
> BuildRequires:	jpackage-utils
>-BuildRequires:	ant
>+BuildRequires:	maven
>+BuildRequires:	maven-enforcer-plugin
> BuildRequires:	desktop-file-utils
> BuildRequires:	ImageMagick
> BuildRequires:	junit
>@@ -58,32 +54,30 @@ This package contains the API documentation for %{name}.
> # unzip the sources jar
> unzip %{name}-src.jar
> %patch0
>+
>+# Unzip and clean up the package-manager sources too
>+unzip packageManager-source.jar -x META-INF/MANIFEST.MF
>+mv org src/main/java
>+%patch1
>+
> # remove prebuilt jars
> 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
>-export CLASSPATH=/usr/share/java/junit.jar ant run_tests
>-%endif
>+mvn-rpmbuild install
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
>+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
>+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
>+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
>+install -pm 644 dist/%{name}-dev-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}.jar
> 
>-# jar
>-ant exejar
>-mkdir -p $RPM_BUILD_ROOT%{_javadir}
>-cp -p dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+# javadocs
>+install -dm 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
>+cp -a doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
> 
>-# javadoc
>-ant docs
>-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>-cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>+# maven depmap
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar
> 
> # wrapper script
> mkdir -p $RPM_BUILD_ROOT%{_bindir}
>@@ -91,9 +85,9 @@ cat > $RPM_BUILD_ROOT%{_bindir}/%{name} <<-EOF
> 	#!/bin/bash
> 	. /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 "weka"
>+	set_classpath "libsvm"
>+	set_classpath "java_cup"
> 	set_classpath "postgresql-jdbc"
> 	set_classpath "hsqldb"
> 	set_classpath "mysql-connector-java"
>@@ -107,25 +101,13 @@ desktop-file-install \
> --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
> # convert icon to png
> convert %{name}.ico %{name}.png
>-install -Dp %{name}.png ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
>-
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>+install -Dp %{name}-0.png ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
> 
>-%post
>-touch --no-create %{_datadir}/icons/hicolor
>-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
>-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
>-fi
>+%post -p /usr/bin/update-desktop-database
> 
>-%postun
>-touch --no-create %{_datadir}/icons/hicolor
>-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
>-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
>-fi
>+%postun -p /usr/bin/update-desktop-database
> 
> %files
>-%defattr(-,root,root,-)
> %{_javadir}/%{name}.jar
> %{_bindir}/%{name}
> %{_datadir}/applications/%{name}.desktop
>@@ -137,12 +119,19 @@ fi
> %doc README
> %doc changelogs
> %doc data
>+%{_mavendepmapfragdir}/%{name}
>+%{_mavenpomdir}/JPP-%{name}.pom
> 
> %files javadoc
>-%defattr(-,root,root,-)
> %{_javadocdir}/%{name}
> 
> %changelog
>+* Tue May 22 2012 Mary Ellen Foster <mefoster at gmail.com> - 3.7.6-1
>+- Update to 3.7.6
>+- Build with maven
>+- Update license
>+- Various clean-ups
>+
> * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6.2-6
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 823914: 586049