Accepting request 238902 from Java:packages

FWD Java:packages fixes

OBS-URL: https://build.opensuse.org/request/show/238902
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreadline-java?expand=0&rev=23

libreadline-java.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jun 27 13:39:34 UTC 2014 - tchvatal@suse.com
+
+- Fix build on sle11
+
+-------------------------------------------------------------------
+Fri Jun 27 12:06:27 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner.
+
 -------------------------------------------------------------------
 Fri Sep 13 09:12:04 UTC 2013 - mvyskocil@suse.com
 

libreadline-java.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libreadline-java
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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,7 +14,6 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# icecream 0
 
 
 Name:           libreadline-java
@@ -23,33 +22,21 @@ Release:        0
 Summary:        Java Wrapper for the EditLine Library
 License:        LGPL-2.1+
 Group:          Development/Libraries/Java
+Url:            http://java-readline.sf.net/
 Source0:        http://download.sourceforge.net/java-readline/libreadline-java-0.8.0-src.tar.gz
 Source1:        baselibs.conf
 Patch0:         libreadline-java-ncurses.patch
 Patch1:         libreadline-java-libdir.patch
 Patch2:         libreadline-java-0.8.0-missing-return-type.patch
-Url:            http://java-readline.sf.net/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 BuildRequires:  java-devel
 BuildRequires:  javapackages-tools
 BuildRequires:  libedit-devel >= 2.9
 BuildRequires:  ncurses-devel
-
-Provides:       gnu.readline
-Provides:       java_readline
-
 Requires:       java >= 1.4.2
 Requires:       libedit >= 2.9
-
-#BuildRequires:  fastjar
-#BuildRequires:  gjdoc
-#BuildRequires:  java-1_4_2-gcj-compat-devel
-#BuildRequires:  readline-devel
-#BuildRequires:  termcap
-#BuildRequires:  unzip
-#BuildRequires:  xerces-j2
-#PreReq:         /sbin/ldconfig
+Provides:       gnu.readline
+Provides:       java_readline
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 libreadline-java provides Java bindings for libedit though a JNI
@@ -66,7 +53,7 @@ wrapper. This package contains the javadoc documentation for it.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0
 %patch1
 %patch2 -p1
@@ -76,8 +63,8 @@ sed -i 's|@LIBDIR@|%{_libdir}|' src/org/gnu/readline/Readline.java
 %build
 export JAVA_HOME=%{java_home}
 export PATH=$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
-make T_LIBS=JavaEditline CFLAGS="%{optflags} -fPIC -DPOSIX"
-make apidoc
+make CFLAGS="%{optflags} -fPIC -DPOSIX" T_LIBS=JavaEditline -j1
+make apidoc -j1
 
 # fix debuginfo package
 rm -f org test
@@ -87,20 +74,20 @@ do
 done
 
 %install
+%if 0%{?suse_version} == 1110
+export NO_BRP_CHECK_BYTECODE_VERSION=true
+%endif
 # install jar file and JNI library under %{_libdir}/%{name}
 # FIXME: fix jpackage-utils to handle multilib correctly
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+mkdir -p %{buildroot}%{_libdir}/%{name}
 install -m 644 %{name}.jar \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.jar
-install -m 755 libJavaEditline.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+  %{buildroot}%{_libdir}/%{name}/%{name}.jar
+install -m 755 libJavaEditline.so %{buildroot}%{_libdir}/%{name}
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -a api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(0644,root,root,0755)
 %doc ChangeLog NEWS README README.1st VERSION COPYING.LIB