From 900b814cd781d53ca76cb8376afe06c4a417d42618098a76b5b8ee9a9991a0c6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 15 Feb 2007 17:21:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreadline-java?expand=0&rev=2 --- libreadline-java-0.8.0-missing-return-type.patch | 13 +++++++++++++ libreadline-java.changes | 5 +++++ libreadline-java.spec | 14 +++++++++----- 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 libreadline-java-0.8.0-missing-return-type.patch diff --git a/libreadline-java-0.8.0-missing-return-type.patch b/libreadline-java-0.8.0-missing-return-type.patch new file mode 100644 index 0000000..b21ce23 --- /dev/null +++ b/libreadline-java-0.8.0-missing-return-type.patch @@ -0,0 +1,13 @@ +Index: libreadline-java-0.8.0/src/native/org_gnu_readline_Readline.c +=================================================================== +--- libreadline-java-0.8.0.orig/src/native/org_gnu_readline_Readline.c ++++ libreadline-java-0.8.0/src/native/org_gnu_readline_Readline.c +@@ -430,7 +430,7 @@ const char *java_completer(char *text, i + jtext = (*jniEnv)->NewStringUTF(jniEnv,text); + + if (jniMethodId == 0) { +- return; ++ return ((const char *)NULL); + } + + completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject, diff --git a/libreadline-java.changes b/libreadline-java.changes index 53b053f..6739b07 100644 --- a/libreadline-java.changes +++ b/libreadline-java.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 14 19:25:27 CET 2007 - dbornkessel@suse.de + +- added missing return type where missing (Bug #237944) + ------------------------------------------------------------------- Thu Dec 14 18:16:24 CET 2006 - jsmeix@suse.de diff --git a/libreadline-java.spec b/libreadline-java.spec index 5bf0037..e412aa7 100644 --- a/libreadline-java.spec +++ b/libreadline-java.spec @@ -1,7 +1,7 @@ # # spec file for package libreadline-java (Version 0.8.0) # -# 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. # @@ -12,18 +12,19 @@ # icecream 0 Name: libreadline-java -BuildRequires: java2-devel-packages readline-devel termcap xerces-j2 +BuildRequires: java-1_4_2-gcj-compat-devel readline-devel termcap xerces-j2 %define name libreadline-java %define version 0.8.0 %define readline_ver 4.3 %define release 9jpp %define section free Version: 0.8.0 -Release: 47 +Release: 57 Summary: Java Wrapper for the GNU Readline Library License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Source0: http://download.sourceforge.net/java-readline/libreadline-java-0.8.0-src.tar.gz -Patch: %{name}-java14compat.patch +Patch0: %{name}-java14compat.patch +Patch1: %{name}-%{version}-missing-return-type.patch URL: http://java-readline.sf.net/ # Requires: readline = %{readline_ver} PreReq: /sbin/ldconfig @@ -55,7 +56,8 @@ This package contains the javadoc documentation for Java-Readline. %prep %setup -q -n %{name}-%{version} -%patch +%patch0 +%patch1 -p1 find . -name "*.jar" -exec rm -f {} \; %build @@ -105,6 +107,8 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/%{name}-%{version} %changelog -n libreadline-java +* Wed Feb 14 2007 - dbornkessel@suse.de +- added missing return type where missing (Bug #237944) * Thu Dec 14 2006 - jsmeix@suse.de - Removed xml-commons-apis from BuildRequires because xerces-j2 already provides xml-commons-apis but xerces-j2 would be