Accepting request 293064 from Java:packages

- Remove gpg-offline dep and cleanup with spec-cleaner

- Fix build with new javapackages-tools

OBS-URL: https://build.opensuse.org/request/show/293064
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bsf?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2015-04-02 14:00:31 +00:00 committed by Git OBS Bridge
commit 6f53a7eb0a
2 changed files with 25 additions and 27 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Mar 25 09:24:47 UTC 2015 - tchvatal@suse.com
- Remove gpg-offline dep and cleanup with spec-cleaner
-------------------------------------------------------------------
Wed Mar 18 09:46:03 UTC 2015 - tchvatal@suse.com
- Fix build with new javapackages-tools
-------------------------------------------------------------------
Mon Sep 9 11:05:34 UTC 2013 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package bsf
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX 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: bsf
@ -28,23 +27,19 @@ Source0: http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{vers
Source1: bsf-pom.xml
Source1000: http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{version}.tar.gz.asc
Source1001: bsf.keyring
#Patch0: bsf-disable-rhino.patch
Patch0: build-file.patch
Patch1: build.properties.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ant
BuildRequires: apache-commons-logging
BuildRequires: gpg-offline
BuildRequires: java-devel
BuildRequires: javapackages-tools
BuildRequires: jython
BuildRequires: rhino
#!BuildIgnore: mysql-connector-java
#BuildRequires: servletapi4
BuildRequires: xalan-j2
BuildRequires: xml-commons-apis
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
Bean Scripting Framework (BSF) is a set of Java classes that provides
@ -60,23 +55,19 @@ engines.
This BSF package currently supports several scripting languages: *
Javascript (using Rhino ECMAScript, from the Mozilla project)
* XSLT Stylesheets (as a component of Apache XML project's Xalan and
Xerces)
In addition, the following languages are supported with their own
BSF engines: * Java (using BeanShell, from the BeanShell project)
* JRuby
* JudoScript
%package javadoc
PreReq: coreutils
Summary: Javadoc for bsf
Group: Development/Libraries/Java
# FIXME: use proper Requires(pre/post/preun/...)
PreReq: coreutils
%description javadoc
Bean Scripting Framework (BSF) is a set of Java classes which provides
@ -93,45 +84,42 @@ engines.
This package contains the javadoc documentation for the Bean Scripting
Framework.
%prep
%gpg_verify %{SOURCE1000}
%setup -q
# remove all binary libs
find . -name "*.jar" -exec %{__rm} -f {} \;
%{__rm} -fr bsf
find . -name "*.jar" -exec rm -f {} \;
rm -fr bsf
%patch0 -p1
%patch1 -p1
%build
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2 jython servlet jspapi)
ant jar
%{__rm} -rf bsf/src/org/apache/bsf/engines/java
rm -rf bsf/src/org/apache/bsf/engines/java
ant javadocs
%install
# jar
%{__install} -d -m 755 %{buildroot}%{_javadir}
%{__install} -m 644 build/lib/%{name}.jar \
install -d -m 755 %{buildroot}%{_javadir}
install -m 644 build/lib/%{name}.jar \
%{buildroot}%{_javadir}/%{name}.jar
# pom and depmap frag
%{__install} -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
install -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.bsf:%{name}"
# javadoc
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}
%{__cp} -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(-,root,root)
%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
%{_javadir}/*
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}
%{_datadir}/maven-metadata/%{name}.xml
%files javadoc
%defattr(-,root,root)