From 226a6980a5a9b365c590e1ed03a90f056b3f7d74b7bea22f163f2ca4ee3e5d7d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 19 Jan 2012 08:43:14 +0000 Subject: [PATCH] Accepting request 100274 from Java:packages - remove libreadline-java-java14compat.patch ( -C -ftarget=1.4 not supported by current javac ) (forwarded request 100108 from AndreasStieger) OBS-URL: https://build.opensuse.org/request/show/100274 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreadline-java?expand=0&rev=17 --- libreadline-java-java14compat.patch | 12 ------------ libreadline-java.changes | 6 ++++++ libreadline-java.spec | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 24 deletions(-) delete mode 100644 libreadline-java-java14compat.patch diff --git a/libreadline-java-java14compat.patch b/libreadline-java-java14compat.patch deleted file mode 100644 index 0b762be..0000000 --- a/libreadline-java-java14compat.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ../libreadline-java-0.8.0.orig/Makefile ./Makefile ---- ../libreadline-java-0.8.0.orig/Makefile 2003-01-07 11:14:35.000000000 +0100 -+++ ./Makefile 2006-09-26 14:04:36.000000000 +0200 -@@ -70,7 +70,7 @@ - - ## normal javac - JAVAC = javac --JC_FLAGS = -+JC_FLAGS = -C -ftarget=1.4 - - ## with jikes - #JAVAC = jikes diff --git a/libreadline-java.changes b/libreadline-java.changes index 82d1848..888bc6b 100644 --- a/libreadline-java.changes +++ b/libreadline-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 12 19:48:34 UTC 2012 - andreas.stieger@gmx.de + +- remove libreadline-java-java14compat.patch + ( -C -ftarget=1.4 not supported by current javac ) + ------------------------------------------------------------------- Mon Feb 1 11:49:09 UTC 2010 - jengelh@medozas.de diff --git a/libreadline-java.spec b/libreadline-java.spec index 7a79cad..ac62434 100644 --- a/libreadline-java.spec +++ b/libreadline-java.spec @@ -1,7 +1,7 @@ # -# spec file for package libreadline-java (Version 0.8.0) +# spec file for package libreadline-java # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,34 +14,36 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild # icecream 0 Name: libreadline-java -BuildRequires: fastjar gjdoc java-1_4_2-gcj-compat-devel readline-devel termcap unzip xerces-j2 +BuildRequires: fastjar +BuildRequires: gjdoc +BuildRequires: java-1_4_2-gcj-compat-devel +BuildRequires: readline-devel +BuildRequires: termcap +BuildRequires: unzip +BuildRequires: 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: 256 +Release: 0 Summary: Java Wrapper for the GNU Readline Library License: LGPL-2.1+ +Group: Development/Libraries/Java Source0: http://download.sourceforge.net/java-readline/libreadline-java-0.8.0-src.tar.gz Source1: baselibs.conf -Patch0: %{name}-java14compat.patch -Patch1: %{name}-%{version}-missing-return-type.patch +Patch1: libreadline-java-0.8.0-missing-return-type.patch Url: http://java-readline.sf.net/ # Requires: readline = %{readline_ver} PreReq: /sbin/ldconfig Provides: java_readline Provides: gnu.readline -Group: Development/Libraries/Java BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on %description Java-Readline is a port of GNU Readline for Java. To be more precise, @@ -50,7 +52,6 @@ it is a JNI wrapper for Readline. It is distributed under the LGPL. %package javadoc -License: LGPL-2.1+ PreReq: coreutils Summary: Javadoc for libreadline-java Group: Development/Libraries/Java @@ -66,7 +67,6 @@ This package contains the javadoc documentation for Java-Readline. %prep %setup -q -n %{name}-%{version} -%patch0 %patch1 -p1 find . -name "*.jar" -exec rm -f {} \;