Hello community, here is the log from the commit of package bsf for openSUSE:Factory checked in at 2013-09-03 22:01:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-03-01 07:26:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bsf.new/bsf.changes 2013-09-03 22:01:47.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Aug 28 08:57:26 UTC 2013 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- bsf-2.3.0.pom bsf-component-info.xml bsf-disable-rhino.patch bsf-src-2.3.0.tar.bz2 New: ---- bsf-pom.xml bsf-src-2.4.0.tar.gz bsf-src-2.4.0.tar.gz.asc bsf.keyring build-file.patch build.properties.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsf.spec ++++++ --- /var/tmp/diff_new_pack.xQ7KVO/_old 2013-09-03 22:01:48.000000000 +0200 +++ /var/tmp/diff_new_pack.xQ7KVO/_new 2013-09-03 22:01:48.000000000 +0200 @@ -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 @@ %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 ++++++ bsf-pom.xml ++++++ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>3</version> </parent> <groupId>bsf</groupId> <artifactId>bsf</artifactId> <version>2.4.0</version> <name>Bean Scripting Framework</name> <url>http://jakarta.apache.org/bsf</url> <scm> <connection>scm:svn:http://svn.apache.org/jakarta/bsf/tags/bsf-2.4.0</connection> <developerConnection>scm:svn:https://svn.apache.org/jakarta/bsf/tags/bsf-2.4.0</developerConnection> <url>http://svn.apache.org/viewvc/jakarta/bsf/tags/bsf-2.4.0</url> </scm> <dependencies> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.0.4</version> <scope>compile</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.2</version> <scope>test</scope> </dependency> </dependencies> </project> ++++++ bsf.keyring ++++++ pub 1024D/329D80D2 2005-11-04 uid Sanka Samaranayake (Oxygenating The Web Service Platform) <[email protected]> uid Sanka Samaranayake (Apache Software Foundation) <[email protected]> sub 2048g/7D6A3872 2005-11-04 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) mQGiBENrqaARBADKPu4/VhGW456GgQD7CGdwyrk0NZs66J+KIbiaI8ajz7NJtE1x o5tF+3nTHL1vqYongVrgk0CESPIIbZwyqDHwu+YFlsu5oIW1iWUeR1/GzggooMKZ D5fUn0D5BH12NCVNCDa46iZ+c2dpfFdpG9cMKbMxkY84hwOv8x54Efn3gwCgm61B kbuFBQiqRwejmrSoH4yiVdkD/257j/1w8Mfps3/LQF36mFxn2/IN5jSzfgeCxxwZ 5Kj9Z4Sy1UGsa7wIrSHgGPdnSTnrBLfDyblLrMGRZpTa7JV6LEdmkXCs/mDDTAeL v1Zt1Lop4u1CjaOD+zIDAsb+qeNvsF5EyZvL+QVlU+RFome/QnkffMIe252wrnbB UrPxA/sFqcrMyqelk+OxzK9aCe0VzWnOLIU7ZSgLqeHRKLpjzjihzK0HO+Kx9feF hABrDZwt8R8sYUs8VSx/Cb7ho7P3qGp0nQSyiWZzv1OKsMcufEU+lyc/QX4Hznep Y6AZYxlUidh+wkiHdB2Y8U7S56C7eWLH9rJclZkeqvpooK4RmrRCU2Fua2EgU2Ft YXJhbmF5YWtlIChBcGFjaGUgU29mdHdhcmUgRm91bmRhdGlvbikgPHNhbmthQGFw YWNoZS5vcmc+iGAEExECACAFAkOIlLYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIX gAAKCRD8d3QRMp2A0k3fAJ9na1VXZCQ5hEF1AN1sr5gdfVC+sQCgiJKgFtIhAXAq YEl7QlHEJcMdyK+0SlNhbmthIFNhbWFyYW5heWFrZSAoT3h5Z2VuYXRpbmcgVGhl IFdlYiBTZXJ2aWNlIFBsYXRmb3JtKSA8c2Fua2FAd3NvMi5jb20+iGAEExECACAF AkOIlxgCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRD8d3QRMp2A0onLAKCH j2OXptENQO/84CsQIwFH+HymsACdGQZ+Sn3/VTh/XHxo1QXQ22L9MIK5Ag0EQ2up wRAIAPCNLSC53vjzrTLYT1iMyb5tHAHX+Hq5ZrSjZ29ZFkKnD8L8Ug/30Ke5RRHi JRbCRodHhJggTD8RG70cZBpKtunAi/Q78Qfq3bNrv+qHOdTmjIRPxXlMPT7GTYj7 6tIXXwj1h/cXJKQ0Rnwx1RXLd0M8Ee5eyYQSidP3iEmPiKpIIFrJ1aZRqQxfd58X wm0NkrG6PEw7UQ2n/DwmACOKoD1tiwWaJCku8H0zSdiIK9LpDG/9Lrf/EVwjYBWJ SZtz0f3Oez0Fo6M+XC7Y36Rv1NKc6VNRovDavJentAv9YCRLkTvX80+80dhnGBQX RYBqs8k/9t4BCBsyYBeqTGXGs+8ABAsIAOFSngcfzVuT0jksHggZ4HeaSYoxnIZu RkdJjyJ6m4mnbbINp/5Ptoh7juZIAuxSKEriIMYg0ojfAnqQseK0n3MlHSdRAK+D L5YqAMIMRI3CikdWrkEahmmql3Iv0kBGLPudil1krmqxP6iQHZd0ZkHLCw5V1gkB xKA04NorLWdiZJL72R5f169u/t0Aa1LB8EbSMxPpTmWvxEzGV0Sp/d4DaGey+GaO 0ezgN7HwFFmIdoDmDjTJ6mIFawpsUn0hsDVxzAo8wRLI+xWQbO7WvJ2qjpj6gmZG htHpaiMkQQhj2DlYzpsjszdCKQdBCGqSbQMmT5UxgDo45zGj1Sp3vx2ISQQYEQIA CQUCQ2upwQIbDAAKCRD8d3QRMp2A0mSJAJ4lORRsyaGVC0XK9FhPHi1H7DZjJACg kkrEBiim5UV69MOCpFKPNJPba6E= =OSx+ -----END PGP PUBLIC KEY BLOCK----- ++++++ build-file.patch ++++++ --- bsf-2.4.0-orig/build.xml 2009-09-09 11:51:20.000000000 +0200 +++ bsf-2.4.0/build.xml 2009-09-14 08:42:17.000000000 +0200 @@ -102,7 +102,7 @@ <pathelement location="${build.tests}"/> </path> - <target name="init" depends="clean"> + <target name="init"> <tstamp /> @@ -134,11 +134,13 @@ <available property="junit.present" classname="junit.framework.TestCase" /> + <!-- <uptodate property="javac.notRequired" targetfile="${build.lib}/${project.name}.jar"> <srcfiles dir="${src.dir}"> <patternset refid="javac.source.files" /> </srcfiles> </uptodate> + --> <uptodate property="javadoc.required" targetfile="${build.lib}/${project.name}.jar"> <srcfiles dir="${build.dir}" includes="**/*.html" /> ++++++ build.properties.patch ++++++ diff --new-file -r -u bsf-2.4.0-orig/build-properties.xml bsf-2.4.0/build-properties.xml --- bsf-2.4.0-orig/build-properties.xml 1970-01-01 01:00:00.000000000 +0100 +++ bsf-2.4.0/build-properties.xml 2007-05-23 15:33:04.000000000 +0200 @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<project name="props"> + <property name="project.name" value="bsf"/> + <property name="project.fullName" value="Bean Scripting Framework"/> + <property name="project.version" value="2.4.0"/> + <property name="project.debug" value="on"/> + <property name="project.deprecation" value="on"/> + + <property name="build.file" value="build.xml"/> + <property name="build.dir" value="build"/> + <property name="build.dest" value="build/classes"/> + <property name="build.lib" value="build/lib"/> + <property name="build.lib.win32" value="build/lib/win32"/> + <property name="build.samples" value="build/samples"/> + <property name="build.samples.calc" value="build/samples/calc"/> + <property name="build.samples.scriptedui" value="build/samples/scriptedui"/> + <property name="build.samples.xsl" value="build/samples/xsl"/> + <property name="build.javadocs" value="build/javadocs"/> + <property name="build.tests" value="build/testcases" /> + + <property name="dist.dir" value="dist"/> + <property name="dist.dir.root" value="${dist.dir}/${project.name}-${project.version}"/> + <property name="dist.bin.file" value="${dist.dir}/${project.name}-bin-${project.version}"/> + <property name="dist.src.file" value="${dist.dir}/${project.name}-src-${project.version}"/> + + <property name="packages" value="org.apache.*"/> + + <property name="samples.dir" value="samples"/> + + <property name="site.src" location="xdocs"/> + <property name="site.dest" location="docs"/> + <property name="site.projectFile" value="stylesheets/project.xml"/> + + <property name="source.level" value="1.3" /> + + <property name="src.dir" value="src"/> + + <property name="templ.path" location="xdocs/stylesheets"/> + + <property name="tests.dir" value="test"/> + + <property name="velocity.props" location="${site.src}/velocity.properties"/> +</project> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
