Hello community, here is the log from the commit of package bsf for openSUSE:Factory checked in at 2015-04-02 16:00:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsf (Old) and /work/SRC/openSUSE:Factory/.bsf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsf" Changes: -------- --- /work/SRC/openSUSE:Factory/bsf/bsf.changes 2013-09-11 13:39:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bsf.new/bsf.changes 2015-04-02 16:00:32.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Mar 25 09:24:47 UTC 2015 - [email protected] + +- Remove gpg-offline dep and cleanup with spec-cleaner + +------------------------------------------------------------------- +Wed Mar 18 09:46:03 UTC 2015 - [email protected] + +- Fix build with new javapackages-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsf.spec ++++++ --- /var/tmp/diff_new_pack.79Lz7I/_old 2015-04-02 16:00:32.000000000 +0200 +++ /var/tmp/diff_new_pack.79Lz7I/_new 2015-04-02 16:00:32.000000000 +0200 @@ -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 @@ 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 @@ 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,14 +84,11 @@ 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 @@ -109,29 +97,29 @@ [ -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)
