From cbb299fc1ae27999c9a5b4ded50ead26fd1d9bf8163d825464b04f0a53f625f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 27 Jun 2014 12:06:50 +0000 Subject: [PATCH] - Cleanup with spec-cleaner. OBS-URL: https://build.opensuse.org/package/show/Java:packages/libreadline-java?expand=0&rev=11 --- libreadline-java.changes | 5 +++++ libreadline-java.spec | 38 +++++++++++--------------------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/libreadline-java.changes b/libreadline-java.changes index 613b285..2c2fa28 100644 --- a/libreadline-java.changes +++ b/libreadline-java.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreadline-java.spec b/libreadline-java.spec index d947795..8eba417 100644 --- a/libreadline-java.spec +++ b/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 @@ -89,18 +76,15 @@ done %install # 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