commit javadict

9 Aug 2007

Hello community,

here is the log from the commit of package javadict
checked in at Thu Aug 9 19:59:15 CEST 2007.

--------

--- javadict/javadict.changes	2006-12-15 15:24:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/javadict/javadict.changes	2007-08-09 13:24:51.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug  9 13:21:22 CEST 2007 - skh@suse.de
+
+- build from source (fixes #227446)
+- fix build with java 1.5
+
+-------------------------------------------------------------------

New:
----
  javadict-java.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ javadict.spec ++++++
--- /var/tmp/diff_new_pack.h10275/_old	2007-08-09 19:57:21.000000000 +0200
+++ /var/tmp/diff_new_pack.h10275/_new	2007-08-09 19:57:21.000000000 +0200
@@ -1,26 +1,29 @@
 #
 # spec file for package javadict (Version 1.1)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# norootforbuild
+# icecream 0
 
 Name:           javadict
-BuildRequires:  edict xjdic-indices
-License:        GNU General Public License (GPL)
+BuildRequires:  edict java2-devel-packages xjdic-indices
+License:        GPL v2 or later
 Group:          Productivity/Office/Dictionary
 Requires:       edict, jre1.1.x, xjdic-indices
 Autoreqprov:    on
 Version:        1.1
-Release:        600
+Release:        631
 URL:            http://www.cs.arizona.edu/japan/JavaDict/
 Source0:        http://www.cs.arizona.edu/japan/JavaDict/download/JavaDict-contest.tar.bz2
 Source1:        javadict.sh
 Patch0:         javadict-fontsetup.patch
+Patch1:         javadict-java.patch
 BuildArchitectures: noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Japanese-English Dictionary Lookup Tool Featuring Handwriting Recognition
@@ -43,9 +46,25 @@
 %prep 
 %setup -c %{name}-%{version} -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p0
 find . -type d | xargs chmod 755
+# clean up precompiled classes
+rm *.class
 
 %build
+javac -target 1.4 -source 1.4 *.java
+mkdir javadict
+mv *.class javadict
+cat <<EOF > manifest
+Manifest-Version: 1.0
+Main-Class: javadict/JavaDict
+EOF
+# sic!, see jar -help
+jar -cvfm javadict.jar manifest javadict/*
+rm -rf javadict
+rm *.java
+# fix permissions
+chmod a-x *.gif
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
@@ -80,7 +99,10 @@
 %dir /usr/lib/javadict/
 /usr/lib/javadict/*
 
-%changelog -n javadict
+%changelog
+* Thu Aug 09 2007 - skh@suse.de
+- build from source (fixes #227446)
+- fix build with java 1.5
 * Fri Dec 15 2006 - mfabian@suse.de
 - Bugzilla #227445: move javadict from /usr/X11R6/bin to /usr/bin.
 - use sazanami fonts instead of kochi fonts in font setup.

++++++ javadict-java.patch ++++++
diff -Naur ../oldjava/BushuGUI.java ./BushuGUI.java
--- ../oldjava/BushuGUI.java	2007-01-24 16:03:50.000000000 +0100
+++ ./BushuGUI.java	2007-01-24 16:05:46.000000000 +0100
@@ -20,16 +20,18 @@
 
 // Bushu-selection method GUI
 
+package javadict;
+
 import java.awt.*;
 import java.io.*;
 import java.util.*;
 import java.awt.event.*;
-import GenList;
-import KanjiButtonList;
-import ButtonList;
-import KanjiViewer;
-import JavaDict;
-import ClearState;
+//import GenList;
+//import KanjiButtonList;
+//import ButtonList;
+//import KanjiViewer;
+//import JavaDict;
+//import ClearState;
 
 class BushSelect extends Panel implements ButtonList.ButtonListListener {
   BushuGUI paps;
diff -Naur ../oldjava/ButtonList.java ./ButtonList.java
--- ../oldjava/ButtonList.java	2007-01-24 16:03:50.000000000 +0100
+++ ./ButtonList.java	2007-01-24 16:05:46.000000000 +0100
@@ -1,9 +1,13 @@
+package javadict;
+
+
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
-import GenList;
+//import GenList;
 
-public synchronized class ButtonList extends Panel implements GenList {
+//public synchronized class ButtonList extends Panel implements GenList {
+public class ButtonList extends Panel implements GenList {
   private int ticker;
 
   public interface ButtonListListener {
diff -Naur ../oldjava/ByteSearch.java ./ByteSearch.java
--- ../oldjava/ByteSearch.java	2007-01-24 16:03:50.000000000 +0100
+++ ./ByteSearch.java	2007-01-24 16:05:46.000000000 +0100
@@ -17,6 +17,7 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
  */
+package javadict;
 
 // B-M search class
 public class ByteSearch {
diff -Naur ../oldjava/ClearState.java ./ClearState.java
--- ../oldjava/ClearState.java	2007-01-24 16:03:50.000000000 +0100
+++ ./ClearState.java	2007-01-24 16:05:46.000000000 +0100
@@ -18,6 +18,8 @@
 
  */
 
+package javadict;
+
 public interface ClearState {
   abstract void clearState();
 }
diff -Naur ../oldjava/CopyLeft.java ./CopyLeft.java
--- ../oldjava/CopyLeft.java	2007-01-24 16:03:50.000000000 +0100
+++ ./CopyLeft.java	2007-01-24 16:05:46.000000000 +0100
@@ -17,6 +17,7 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
  */
+package javadict;
 
 // CopyLeft viewer panel
 
diff -Naur ../oldjava/DrawPanel.java ./DrawPanel.java
--- ../oldjava/DrawPanel.java	2007-01-24 16:03:50.000000000 +0100
+++ ./DrawPanel.java	2007-01-24 16:05:46.000000000 +0100
@@ -18,6 +18,8 @@
 
  */
 
+package javadict;
+
 import java.awt.*;
 import java.lang.*;
 import java.awt.event.*;
diff -Naur ../oldjava/Filter.java ./Filter.java
--- ../oldjava/Filter.java	2007-01-24 16:03:50.000000000 +0100
+++ ./Filter.java	2007-01-24 16:05:46.000000000 +0100
@@ -18,9 +18,10 @@
 
  */
 
+package javadict;
 // Interface define filter functions
 import java.util.*;
-import GUI;
+//import GUI;
 
 public interface Filter {
   public class romajiFilter implements Filter {
diff -Naur ../oldjava/GenList.java ./GenList.java
--- ../oldjava/GenList.java	2007-01-24 16:03:50.000000000 +0100
+++ ./GenList.java	2007-01-24 16:05:46.000000000 +0100
@@ -17,6 +17,7 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
  */
+package javadict;
 
 import java.awt.*;
 import java.util.*;
diff -Naur ../oldjava/GUI.java ./GUI.java
--- ../oldjava/GUI.java	2007-01-24 16:03:50.000000000 +0100
+++ ./GUI.java	2007-01-24 16:05:46.000000000 +0100
@@ -18,13 +18,15 @@
 
  */
 
+package javadict;
+
 import java.awt.*;
 import java.awt.event.*;
 import java.io.*;
 import java.util.*;
-import JavaDict;
-import GenList;
-import ButtonList;
+//import JavaDict;
+//import GenList;
+//import ButtonList;
 
 class LookupAction implements ActionListener {
   String dict, dictindex;
@@ -502,13 +504,13 @@
   
   static private class LineSelectListener implements ItemListener {
     
-    List l;
+    java.awt.List l;
     JavaDict javadict;
     Button searchbut = null;
     ButtonList bl = null;
     Frame d = null;
     
-    public LineSelectListener(List l, JavaDict javadict) {
+    public LineSelectListener(java.awt.List l, JavaDict javadict) {
       this.l=l;
       this.javadict=javadict;
     }
diff -Naur ../oldjava/HighLightMap.java ./HighLightMap.java
--- ../oldjava/HighLightMap.java	2007-01-24 16:03:50.000000000 +0100
+++ ./HighLightMap.java	2007-01-24 16:05:46.000000000 +0100
@@ -17,6 +17,7 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
  */
+package javadict;
 
 import java.awt.*;
 import java.awt.event.*;
diff -Naur ../oldjava/HWRGUI.java ./HWRGUI.java
--- ../oldjava/HWRGUI.java	2007-01-24 16:03:50.000000000 +0100
+++ ./HWRGUI.java	2007-01-24 16:05:46.000000000 +0100
@@ -18,11 +18,13 @@
 
  */
 
+package javadict;
+
 // The handwriting recognition GUI
-import JavaDict;
+//import JavaDict;
 import java.awt.*;
-import KanjiViewer;
-import DrawPanel;
+//import KanjiViewer;
+//import DrawPanel;
 import java.awt.event.*;
 
 class HWRGUI extends Panel implements ActionListener {
diff -Naur ../oldjava/JavaDict.java ./JavaDict.java
--- ../oldjava/JavaDict.java	2007-01-24 16:03:50.000000000 +0100
+++ ./JavaDict.java	2007-01-24 16:05:46.000000000 +0100
@@ -17,23 +17,24 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
  */
+package javadict;
 
 import java.util.*;
 import java.awt.*;
 import java.io.*;
 import java.awt.event.*;
-import GUI;
-import ByteSearch;
-import SkipGUI;
-import GenList;
-import KanjiViewer;
+//import GUI;
+//import ByteSearch;
+//import SkipGUI;
+//import GenList;
+//import KanjiViewer;
 //import HWRGUI;
-import HighLightMap;
-import CopyLeft;
-import BushuGUI;
-//import OnlineDocs;
-import Filter;
-import ClearState;
+//import HighLightMap;
+//import CopyLeft;
+//import BushuGUI;
+////import OnlineDocs;
+//import Filter;
+//import ClearState;
 
 public class JavaDict {
   //  static public Frame f;
diff -Naur ../oldjava/javadict.patch ./javadict.patch
--- ../oldjava/javadict.patch	1970-01-01 01:00:00.000000000 +0100
+++ ./javadict.patch	2007-01-24 16:06:42.000000000 +0100
@@ -0,0 +1,227 @@
+diff -Naur ../oldjava/BushuGUI.java ./BushuGUI.java
+--- ../oldjava/BushuGUI.java	2007-01-24 16:03:50.000000000 +0100
++++ ./BushuGUI.java	2007-01-24 16:05:46.000000000 +0100
+@@ -20,16 +20,18 @@
+ 
+ // Bushu-selection method GUI
+ 
++package javadict;
++
+ import java.awt.*;
+ import java.io.*;
+ import java.util.*;
+ import java.awt.event.*;
+-import GenList;
+-import KanjiButtonList;
+-import ButtonList;
+-import KanjiViewer;
+-import JavaDict;
+-import ClearState;
++//import GenList;
++//import KanjiButtonList;
++//import ButtonList;
++//import KanjiViewer;
++//import JavaDict;
++//import ClearState;
+ 
+ class BushSelect extends Panel implements ButtonList.ButtonListListener {
+   BushuGUI paps;
+diff -Naur ../oldjava/ButtonList.java ./ButtonList.java
+--- ../oldjava/ButtonList.java	2007-01-24 16:03:50.000000000 +0100
++++ ./ButtonList.java	2007-01-24 16:05:46.000000000 +0100
+@@ -1,9 +1,13 @@
++package javadict;
++
++
+ import java.awt.*;
+ import java.awt.event.*;
+ import java.util.*;
+-import GenList;
++//import GenList;
+ 
+-public synchronized class ButtonList extends Panel implements GenList {
++//public synchronized class ButtonList extends Panel implements GenList {
++public class ButtonList extends Panel implements GenList {
+   private int ticker;
+ 
+   public interface ButtonListListener {
+diff -Naur ../oldjava/ByteSearch.java ./ByteSearch.java
+--- ../oldjava/ByteSearch.java	2007-01-24 16:03:50.000000000 +0100
++++ ./ByteSearch.java	2007-01-24 16:05:46.000000000 +0100
+@@ -17,6 +17,7 @@
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+  */
++package javadict;
+ 
+ // B-M search class
+ public class ByteSearch {
+diff -Naur ../oldjava/ClearState.java ./ClearState.java
+--- ../oldjava/ClearState.java	2007-01-24 16:03:50.000000000 +0100
++++ ./ClearState.java	2007-01-24 16:05:46.000000000 +0100
+@@ -18,6 +18,8 @@
+ 
+  */
+ 
++package javadict;
++
+ public interface ClearState {
+   abstract void clearState();
+ }
+diff -Naur ../oldjava/CopyLeft.java ./CopyLeft.java
+--- ../oldjava/CopyLeft.java	2007-01-24 16:03:50.000000000 +0100
++++ ./CopyLeft.java	2007-01-24 16:05:46.000000000 +0100
+@@ -17,6 +17,7 @@
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+  */
++package javadict;
+ 
+ // CopyLeft viewer panel
+ 
+diff -Naur ../oldjava/DrawPanel.java ./DrawPanel.java
+--- ../oldjava/DrawPanel.java	2007-01-24 16:03:50.000000000 +0100
++++ ./DrawPanel.java	2007-01-24 16:05:46.000000000 +0100
+@@ -18,6 +18,8 @@
+ 
+  */
+ 
++package javadict;
++
+ import java.awt.*;
+ import java.lang.*;
+ import java.awt.event.*;
+diff -Naur ../oldjava/Filter.java ./Filter.java
+--- ../oldjava/Filter.java	2007-01-24 16:03:50.000000000 +0100
++++ ./Filter.java	2007-01-24 16:05:46.000000000 +0100
+@@ -18,9 +18,10 @@
+ 
+  */
+ 
++package javadict;
+ // Interface define filter functions
+ import java.util.*;
+-import GUI;
++//import GUI;
+ 
+ public interface Filter {
+   public class romajiFilter implements Filter {
+diff -Naur ../oldjava/GenList.java ./GenList.java
+--- ../oldjava/GenList.java	2007-01-24 16:03:50.000000000 +0100
++++ ./GenList.java	2007-01-24 16:05:46.000000000 +0100
+@@ -17,6 +17,7 @@
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+  */
++package javadict;
+ 
+ import java.awt.*;
+ import java.util.*;
+diff -Naur ../oldjava/GUI.java ./GUI.java
+--- ../oldjava/GUI.java	2007-01-24 16:03:50.000000000 +0100
++++ ./GUI.java	2007-01-24 16:05:46.000000000 +0100
+@@ -18,13 +18,15 @@
+ 
+  */
+ 
++package javadict;
++
+ import java.awt.*;
+ import java.awt.event.*;
+ import java.io.*;
+ import java.util.*;
+-import JavaDict;
+-import GenList;
+-import ButtonList;
++//import JavaDict;
++//import GenList;
++//import ButtonList;
+ 
+ class LookupAction implements ActionListener {
+   String dict, dictindex;
+@@ -502,13 +504,13 @@
+   
+   static private class LineSelectListener implements ItemListener {
+     
+-    List l;
++    java.awt.List l;
+     JavaDict javadict;
+     Button searchbut = null;
+     ButtonList bl = null;
+     Frame d = null;
+     
+-    public LineSelectListener(List l, JavaDict javadict) {
++    public LineSelectListener(java.awt.List l, JavaDict javadict) {
+       this.l=l;
+       this.javadict=javadict;
+     }
+diff -Naur ../oldjava/HighLightMap.java ./HighLightMap.java
+--- ../oldjava/HighLightMap.java	2007-01-24 16:03:50.000000000 +0100
++++ ./HighLightMap.java	2007-01-24 16:05:46.000000000 +0100
+@@ -17,6 +17,7 @@
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+  */
++package javadict;
+ 
+ import java.awt.*;
+ import java.awt.event.*;
+diff -Naur ../oldjava/HWRGUI.java ./HWRGUI.java
+--- ../oldjava/HWRGUI.java	2007-01-24 16:03:50.000000000 +0100
++++ ./HWRGUI.java	2007-01-24 16:05:46.000000000 +0100
+@@ -18,11 +18,13 @@
+ 
+  */
+ 
++package javadict;
++
+ // The handwriting recognition GUI
+-import JavaDict;
++//import JavaDict;
+ import java.awt.*;
+-import KanjiViewer;
+-import DrawPanel;
++//import KanjiViewer;
++//import DrawPanel;
+ import java.awt.event.*;
+ 
+ class HWRGUI extends Panel implements ActionListener {
+diff -Naur ../oldjava/JavaDict.java ./JavaDict.java
+--- ../oldjava/JavaDict.java	2007-01-24 16:03:50.000000000 +0100
++++ ./JavaDict.java	2007-01-24 16:05:46.000000000 +0100
+@@ -17,23 +17,24 @@
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+  */
++package javadict;
+ 
+ import java.util.*;
+ import java.awt.*;
+ import java.io.*;
+ import java.awt.event.*;
+-import GUI;
+-import ByteSearch;
+-import SkipGUI;
+-import GenList;
+-import KanjiViewer;
++//import GUI;
++//import ByteSearch;
++//import SkipGUI;
++//import GenList;
++//import KanjiViewer;
+ //import HWRGUI;
+-import HighLightMap;
+-import CopyLeft;
+-import BushuGUI;
+-//import OnlineDocs;
+-import Filter;
+-import ClearState;
++//import HighLightMap;
++//import CopyLeft;
++//import BushuGUI;
++////import OnlineDocs;
++//import Filter;
++//import ClearState;
+ 
+ public class JavaDict {
+   //  static public Frame f;
diff -Naur ../oldjava/KanjiButtonList.java ./KanjiButtonList.java
--- ../oldjava/KanjiButtonList.java	2007-01-24 16:03:50.000000000 +0100
+++ ./KanjiButtonList.java	2007-01-24 16:05:46.000000000 +0100
@@ -17,9 +17,9 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
  */
-
+package javadict;
 import java.awt.*;
-import ButtonList;
+//import ButtonList;
 
 public class KanjiButtonList extends ButtonList {
   public interface BushuProvider {
diff -Naur ../oldjava/KanjiViewer.java ./KanjiViewer.java
--- ../oldjava/KanjiViewer.java	2007-01-24 16:03:50.000000000 +0100
+++ ./KanjiViewer.java	2007-01-24 16:05:46.000000000 +0100
@@ -17,14 +17,15 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
  */
+package javadict;
 
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
-import ButtonList;
-import JavaDict;
-import GUI;
-import GenList;
+//import ButtonList;
+//import JavaDict;
+//import GUI;
+//import GenList;
 
 public class KanjiViewer extends Panel implements 
 ButtonList.ButtonListListener,ItemListener,GenList {
diff -Naur ../oldjava/OptionGUI.java ./OptionGUI.java
--- ../oldjava/OptionGUI.java	2007-01-24 16:03:50.000000000 +0100
+++ ./OptionGUI.java	2007-01-24 16:05:46.000000000 +0100
@@ -17,12 +17,12 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
  */
-
-import JavaDict;
+package javadict;
+//import JavaDict;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
-import ClearState;
+//import ClearState;
 
 public class OptionGUI extends Panel implements ActionListener {
   JavaDict javadict;
diff -Naur ../oldjava/SkipGUI.java ./SkipGUI.java
--- ../oldjava/SkipGUI.java	2007-01-24 16:03:50.000000000 +0100
+++ ./SkipGUI.java	2007-01-24 16:05:46.000000000 +0100
@@ -18,13 +18,15 @@
 
  */
 
+package javadict;
+
 import java.awt.*;
 import java.io.*;
 import java.awt.event.*;
-//import GenList;
-import KanjiButtonList;
-import KanjiViewer;
-import ClearState;
+////import GenList;
+//import KanjiButtonList;
+//import KanjiViewer;
+//import ClearState;
 
 class ImageCanvas extends Canvas implements MouseListener, KeyListener {
   Container pappy;
++++++ javadict.sh ++++++
--- javadict/javadict.sh	2003-07-01 11:26:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/javadict/javadict.sh	2007-08-09 13:46:46.000000000 +0200
@@ -8,4 +8,4 @@
 export LC_ALL=ja_JP.eucJP
 
 cd /usr/lib/javadict
-java JavaDict
+java -jar javadict.jar


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit javadict

root＠Hilbert.suse.de