- update to 2.4.0

* can be used as an extension package to Java by placing it into
    "jre/lib/ext" [using the thread's context classloader, ie. the result
    of 'Thread.currentThread().getContextClassLoader()']
  * rely on commons-logging or log4j
  * removed jpython engine, supperseeded by jython
  * and more, see CHANGES.txt
- add gpg verification
- drop bsf-disable-rhino.patch
- add build-file.patch and build.properties.patch
- use add_maven_depmap from javapackages-tools

OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=15

bsf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bsf
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -17,33 +17,35 @@
 # icecream 0
 
 
-%define name		bsf
-%define version		2.3.0
-%define release		8jpp
-%define section		free
-
 Name:           bsf
-BuildRequires:  ant
-BuildRequires:  java-devel
-BuildRequires:  jython
-#!BuildIgnore: mysql-connector-java
-BuildRequires:  servletapi4
-BuildRequires:  xalan-j2
-BuildRequires:  xml-commons-apis
-Version:        2.3.0
+Version:        2.4.0
 Release:        0
 Summary:        Bean Scripting Framework
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-Url:            http://jakarta.apache.org/bsf/
-Source0:        http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.bz2
-Source1:        bsf-component-info.xml
-Source2:        bsf-2.3.0.pom
-#Patch:          %{name}-java14compat.patch
-Patch0:         bsf-disable-rhino.patch
+Url:            http://commons.apache.org/bsf/
+Source0:        http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{version}.tar.gz
+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:  jpackage-utils >= 1.7
+BuildRequires:  jython
+BuildRequires:  rhino
+#!BuildIgnore: mysql-connector-java
+#BuildRequires:  servletapi4
+BuildRequires:  xalan-j2
+BuildRequires:  xml-commons-apis
+
 %description
 Bean Scripting Framework (BSF) is a set of Java classes that provides
 scripting language support within Java applications and access to Java
@@ -94,50 +96,46 @@ Framework.
 
 
 %prep
+%gpg_verify %{SOURCE1000}
 %setup -q
 # remove all binary libs
 find . -name "*.jar" -exec %{__rm} -f {} \;
 %{__rm} -fr bsf
-tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
-sed -i "s/@TAG@/$tag/g" %{SOURCE1}
-%patch0 -b .disable-rhino
+
+%patch0 -p1
+%patch1 -p1
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java 
-export CLASSPATH=$(build-classpath rhino xalan-j2 jython servlet jspapi)
-cd src
-ant realclean
-ant compile
+export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2 jython servlet jspapi)
+ant jar
 %{__rm} -rf bsf/src/org/apache/bsf/engines/java
 ant javadocs
 
 %install
 # jar
 %{__install} -d -m 755 %{buildroot}%{_javadir}
-%{__install} -m 644 src/build/lib/%{name}.jar \
-%{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
+%{__install} -m 644 build/lib/%{name}.jar \
+            %{buildroot}%{_javadir}/%{name}.jar
+
 # pom and depmap frag
-%{__install} -d -m 755 %{buildroot}%{_datadir}/maven2/poms
-%{__install} -m 644 %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP-bsf.pom
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+%{__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}-%{version}
-%{__cp} -pr src/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+%{__cp} -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %defattr(-,root,root)
-%doc license.txt src/AUTHORS src/BUILDING src/CHANGES src/CHANGES.old src/INSTALL src/README src/TODO
+%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
 %{_javadir}/*
-%{_datadir}/maven2/poms
+%{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}
 
 %files javadoc
 %defattr(-,root,root)
-%dir %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}-%{version}/*
+%dir %{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog