diff --git a/libreadline-java-java14compat.patch b/libreadline-java-java14compat.patch index 91028a1..0b762be 100644 --- a/libreadline-java-java14compat.patch +++ b/libreadline-java-java14compat.patch @@ -6,7 +6,7 @@ diff -Naur ../libreadline-java-0.8.0.orig/Makefile ./Makefile ## normal javac JAVAC = javac -JC_FLAGS = -+JC_FLAGS = -source 1.4 -target 1.4 ++JC_FLAGS = -C -ftarget=1.4 ## with jikes #JAVAC = jikes diff --git a/libreadline-java.changes b/libreadline-java.changes index 5e7edef..06d825e 100644 --- a/libreadline-java.changes +++ b/libreadline-java.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 23 14:34:34 CET 2008 - mvyskocil@suse.cz + +- fixed beta build + ------------------------------------------------------------------- Tue May 29 18:40:54 CEST 2007 - dbornkessel@suse.de diff --git a/libreadline-java.spec b/libreadline-java.spec index 3a05956..0428ba0 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) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 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. # @@ -19,20 +19,20 @@ BuildRequires: fastjar gjdoc java-1_4_2-gcj-compat-devel readline-devel termcap %define release 9jpp %define section free Version: 0.8.0 -Release: 87 +Release: 167 Summary: Java Wrapper for the GNU Readline Library -License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: LGPL v2.1 or later Source0: http://download.sourceforge.net/java-readline/libreadline-java-0.8.0-src.tar.gz Patch0: %{name}-java14compat.patch Patch1: %{name}-%{version}-missing-return-type.patch -URL: http://java-readline.sf.net/ +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 +AutoReqProv: on %description Java-Readline is a port of GNU Readline for Java. To be more precise, @@ -63,29 +63,21 @@ find . -name "*.jar" -exec rm -f {} \; %build export JAVA_HOME=%{java_home} export PATH=$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH - %__make T_LIBS=JavaReadline LIBPATH=-L%{_libdir}/termcap - %__make apidoc %install # jar - %__mkdir_p %{buildroot}%{_jnidir}-ext - %__install -m 644 %{name}.jar %{buildroot}%{_jnidir}-ext/%{name}-%{version}.jar (cd %{buildroot}%{_jnidir}-ext && for jar in *-%{version}*; do \ ln -sf ${jar} ${jar/-%{version}/}; done) # lib - %__mkdir_p %{buildroot}%{_libdir} - %__install -m 755 libJavaReadline.so %{buildroot}%{_libdir}/libJavaReadline.so.%{version} (cd %{buildroot}%{_libdir} && ln -sf libJavaReadline.so.%{version} libJavaReadline.so) # javadoc - %__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version} - %__cp -a api/* %{buildroot}%{_javadocdir}/%{name}-%{version} %clean @@ -107,13 +99,15 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/%{name}-%{version} %changelog -* Tue May 29 2007 - dbornkessel@suse.de +* Wed Jan 23 2008 mvyskocil@suse.cz +- fixed beta build +* Tue May 29 2007 dbornkessel@suse.de - added gjdoc and fastjar to BuildRequires -* Wed May 02 2007 - dbornkessel@suse.de +* Wed May 02 2007 dbornkessel@suse.de - added unzip to BuildRequires -* Wed Feb 14 2007 - dbornkessel@suse.de +* Wed Feb 14 2007 dbornkessel@suse.de - added missing return type where missing (Bug #237944) -* Thu Dec 14 2006 - jsmeix@suse.de +* 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 deinstalled when rpm installs xml-commons-apis after xerces-j2 @@ -121,27 +115,27 @@ rm -rf $RPM_BUILD_ROOT xerces-j2 the RPM capabilities jaxp_parser_impl and xml-commons-resolver are no longer provided in the installed system. -* Tue Sep 26 2006 - skh@suse.de +* Tue Sep 26 2006 skh@suse.de - don't use icecream - use -source 1.4 and -target 1.4 for build with java 1.5 -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Nov 25 2005 - jsmeix@suse.de +* Fri Nov 25 2005 jsmeix@suse.de - Replaced {_jnidir} by {_jnidir}-ext -* Wed Aug 17 2005 - uli@suse.de +* Wed Aug 17 2005 uli@suse.de - fixed to build on lib64 archs -* Thu Jul 28 2005 - jsmeix@suse.de +* Thu Jul 28 2005 jsmeix@suse.de - Adjustments in the spec file. -* Mon Jul 18 2005 - jsmeix@suse.de +* Mon Jul 18 2005 jsmeix@suse.de - Current version 0.8.0 from JPackage.org -* Wed Jul 13 2005 - uli@suse.de +* Wed Jul 13 2005 uli@suse.de - lib64tified (fixes s390x) -* Thu Nov 18 2004 - ro@suse.de +* Thu Nov 18 2004 ro@suse.de - fixed file list -* Wed Sep 15 2004 - skh@suse.de +* Wed Sep 15 2004 skh@suse.de - Fix Requires (remove fixed dependency on readline 4.3 and enable rpm dependency check) -* Wed Sep 08 2004 - skh@suse.de +* Wed Sep 08 2004 skh@suse.de - Fix PreRequire -* Thu Sep 02 2004 - skh@suse.de +* Thu Sep 02 2004 skh@suse.de - Initial package created with version 0.8.0 (JPackage 1.5)