Hello community,
here is the log from the commit of package bsf for openSUSE:Factory
checked in at Thu Aug 6 21:48:43 CEST 2009.
--------
--- bsf/bsf.changes 2008-11-05 02:17:59.000000000 +0100
+++ bsf/bsf.changes 2009-08-04 08:36:37.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Aug 4 06:35:09 UTC 2009 - mvyskocil@suse.cz
+
+- Remove rhino dependency at all
+- Added pom and maven depmap files from jpackage 5.0
+- Removed javadoc %%post/un scripts
+
+-------------------------------------------------------------------
+Mon Aug 3 16:09:13 UTC 2009 - mvyskocil@suse.cz
+
+- Build using rhino
+- Used bzip2 archive
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
bsf-src-2.3.0.tar.gz
New:
----
bsf-2.3.0.pom
bsf-component-info.xml
bsf-disable-rhino.patch
bsf-src-2.3.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bsf.spec ++++++
--- /var/tmp/diff_new_pack.rI2DFh/_old 2009-08-06 21:44:21.000000000 +0200
+++ /var/tmp/diff_new_pack.rI2DFh/_new 2009-08-06 21:44:21.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package bsf (Version 2.3.0)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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
@@ -18,22 +18,29 @@
# norootforbuild
# icecream 0
-
-Name: bsf
-BuildRequires: ant java2-devel-packages jython oldrhino servletapi4 xalan-j2 xml-commons-apis
-#!BuildIgnore: rhino
%define name bsf
%define version 2.3.0
%define release 8jpp
%define section free
+
+Name: bsf
+BuildRequires: ant
+BuildRequires: java-devel
+BuildRequires: jython
+BuildRequires: servletapi4
+BuildRequires: xalan-j2
+BuildRequires: xml-commons-apis
Version: 2.3.0
-Release: 321
+Release: 322
Summary: Bean Scripting Framework
-License: The Apache Software License
+License: Apache Software License ..
Url: http://jakarta.apache.org/bsf/
Group: Development/Libraries/Java
-Source0: http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
-Patch: %{name}-java14compat.patch
+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
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -65,7 +72,7 @@
%package javadoc
-License: The Apache Software License
+License: Apache Software License ..
PreReq: coreutils
Summary: Javadoc for bsf
Group: Development/Libraries/Java
@@ -89,14 +96,16 @@
%prep
%setup -q
-%patch
# 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
%build
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-export CLASSPATH=$(build-classpath oldrhino xalan-j2 jython servlet jspapi)
+export CLASSPATH=$(build-classpath rhino xalan-j2 jython servlet jspapi)
cd src
ant realclean
ant compile
@@ -110,6 +119,10 @@
%{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
ln -sf ${jar} ${jar/-%{version}/}; done)
+# 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}
# javadoc
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
%{__cp} -pr src/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
@@ -118,24 +131,17 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post javadoc
-%{__rm} -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ $1 -eq 0 ]; then
- %{__rm} -f %{_javadocdir}/%{name}
-fi
-
%files
%defattr(-,root,root)
%doc license.txt src/AUTHORS src/BUILDING src/CHANGES src/CHANGES.old src/INSTALL src/README src/TODO
%{_javadir}/*
+%{_datadir}/maven2/poms
+%{_mavendepmapfragdir}
%files javadoc
%defattr(-,root,root)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}-%{version}/*
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
%changelog
++++++ bsf-2.3.0.pom ++++++
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>bsf</groupId>
<artifactId>bsf</artifactId>
<version>2.3.0</version>
</project>++++++ bsf-component-info.xml ++++++
<project name="apache-bsf-component-info">
<!-- ============================================================ -->
<!-- Apache Bean Scripting Framework (BSF) -->
<!-- ============================================================ -->
<component id="apache-bsf"
licenseType="apache-1.1"
version="2.3.0-brew"
projectHome="http://jakarta.apache.org/bsf/"
description="Apache Bean Scripting Framework (BSF)"
scm=":ext:cvs.devel.redhat.com:/cvs/dist/bsf"
tag="bsf-2_3_0-12_jpp5">
<!-- Built using JDK 1.4 -->
<artifact id="bsf.jar"/>
<export>
<include input="bsf.jar"/>
</export>
</component>
</project>
++++++ bsf-disable-rhino.patch ++++++
--- src/bsf/build.xml
+++ src/bsf/build.xml
@@ -128,9 +128,6 @@
<available property="netrexx.present"
classname="netrexx.lang.Rexx"/>
-