rpms/jikes/devel jikes-166457.patch,NONE,1.1 jikes.spec,1.10,1.11

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/jikes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22292/devel

Modified Files:
	jikes.spec 
Added Files:
	jikes-166457.patch 
Log Message:
* Mon Aug 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.22-4
- Apply patch from Debian/upstream to get a fix for a couple of
  deprecation related bugs and a man page typo (#166457).


jikes-166457.patch:

--- NEW FILE jikes-166457.patch ---
--- jikes-1.22.orig/doc/jikes.1
+++ jikes-1.22/doc/jikes.1
@@ -185,7 +185,7 @@
 compatibility to older virtual machines, and some source constructs
 will be compiled to less efficient workarounds in order to avoid known
 virtual machine bugs or deficiencies.  However, a lower target may
-occaisionally produce incorrect semantic behavior.  Furthermore, some
+occasionally produce incorrect semantic behavior.  Furthermore, some
 language features require virtual machine support, where there are no
 known workarounds in earlier releases: the assert statement requires
 1.4 (unless you also use \fB\-noassert\fP), and the planned addition
--- jikes-1.22.orig/src/decl.cpp
+++ jikes-1.22/src/decl.cpp
@@ -1,4 +1,4 @@
-// $Id: decl.cpp,v 1.144 2004/09/26 22:40:41 elliott-oss Exp $
+// $Id: decl.cpp,v 1.145 2004/10/09 18:04:50 elliott-oss Exp $
 //
 // This software is subject to the terms of the IBM Jikes Compiler
 // License Agreement available at the following URL:
@@ -2596,7 +2596,9 @@
     //
     if (control.option.deprecation &&
         hidden_method -> IsDeprecated() &&
-        ! method -> containing_type -> file_symbol -> IsClassOnly())
+        ! method -> containing_type -> file_symbol -> IsClassOnly() &&
+        ! method -> IsDeprecated() &&
+        ! InDeprecatedContext())
     {
         ReportSemError(SemanticError::DEPRECATED_METHOD_OVERRIDE,
                        left_tok, right_tok, method -> Header(),
--- jikes-1.22.orig/src/error.cpp
+++ jikes-1.22/src/error.cpp
@@ -1,4 +1,4 @@
-// $Id: error.cpp,v 1.159 2004/09/26 22:40:41 elliott-oss Exp $
+// $Id: error.cpp,v 1.160 2004/10/10 02:59:40 elliott-oss Exp $
 //
 // This software is subject to the terms of the IBM Jikes Compiler
 // License Agreement available at the following URL:
@@ -513,6 +513,7 @@
     warning[DEPRECATED_FIELD] = WEAK_WARNING;
     warning[DEPRECATED_METHOD] = WEAK_WARNING;
     warning[DEPRECATED_CONSTRUCTOR] = WEAK_WARNING;
+    warning[DEPRECATED_METHOD_OVERRIDE] = WEAK_WARNING;
 
     warning[UNNECESSARY_TYPE_IMPORT] = WEAK_WARNING;
     warning[MULTIPLE_PUBLIC_TYPES] = WEAK_WARNING;


Index: jikes.spec
===================================================================
RCS file: /cvs/extras/rpms/jikes/devel/jikes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jikes.spec	19 May 2005 18:05:45 -0000	1.10
+++ jikes.spec	26 Aug 2005 19:49:23 -0000	1.11
@@ -1,12 +1,14 @@
 Name:           jikes
 Version:        1.22
-Release:        3
+Release:        4%{?dist}
 Summary:        Java source file to bytecode compiler
 
 License:        IBM Public License
 Group:          Development/Languages
 URL:            http://jikes.sourceforge.net/
 Source:         http://download.sf.net/jikes/%{name}-%{version}.tar.bz2
+# http://ftp.debian.org/debian/pool/main/j/jikes/jikes_1.22-3.diff.gz
+Patch0:         %{name}-166457.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n)
 
 Obsoletes:      guavac
@@ -20,6 +22,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -47,6 +50,10 @@
 
 
 %changelog
+* Mon Aug 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.22-4
+- Apply patch from Debian/upstream to get a fix for a couple of
+  deprecation related bugs and a man page typo (#166457).
+
 * Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.22-3
 - Fix URLs.