From 643b5023b58b22fb703ec26b614ef4a435703971a73c7124c1bbd7eea9186cc4 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 6 Aug 2009 19:48:46 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bsf?expand=0&rev=4 --- bsf-2.3.0.pom | 6 ++++ bsf-component-info.xml | 18 ++++++++++++ bsf-disable-rhino.patch | 12 ++++++++ bsf-src-2.3.0.tar.bz2 | 3 ++ bsf-src-2.3.0.tar.gz | 3 -- bsf.changes | 13 +++++++++ bsf.spec | 65 ++++++++++++++++++----------------------- 7 files changed, 80 insertions(+), 40 deletions(-) create mode 100644 bsf-2.3.0.pom create mode 100644 bsf-component-info.xml create mode 100644 bsf-disable-rhino.patch create mode 100644 bsf-src-2.3.0.tar.bz2 delete mode 100644 bsf-src-2.3.0.tar.gz diff --git a/bsf-2.3.0.pom b/bsf-2.3.0.pom new file mode 100644 index 0000000..4ef9b18 --- /dev/null +++ b/bsf-2.3.0.pom @@ -0,0 +1,6 @@ + + 4.0.0 + bsf + bsf + 2.3.0 + \ No newline at end of file diff --git a/bsf-component-info.xml b/bsf-component-info.xml new file mode 100644 index 0000000..d6cb288 --- /dev/null +++ b/bsf-component-info.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/bsf-disable-rhino.patch b/bsf-disable-rhino.patch new file mode 100644 index 0000000..693f480 --- /dev/null +++ b/bsf-disable-rhino.patch @@ -0,0 +1,12 @@ +--- src/bsf/build.xml ++++ src/bsf/build.xml +@@ -128,9 +128,6 @@ + + +- +- + + diff --git a/bsf-src-2.3.0.tar.bz2 b/bsf-src-2.3.0.tar.bz2 new file mode 100644 index 0000000..b235ba6 --- /dev/null +++ b/bsf-src-2.3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65eb8967e18879298775319246885e88ddea1ff2956b0ab9efa0f761627a66c9 +size 866760 diff --git a/bsf-src-2.3.0.tar.gz b/bsf-src-2.3.0.tar.gz deleted file mode 100644 index aa07c0f..0000000 --- a/bsf-src-2.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed0caf3567d7c084f21c0f0ce38077384c8e4afc80a1df7a2095a53ada777503 -size 1035181 diff --git a/bsf.changes b/bsf.changes index e72c0da..c7bbf8f 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Wed Nov 5 02:17:54 CET 2008 - ro@suse.de diff --git a/bsf.spec b/bsf.spec index 1539245..562a30a 100644 --- a/bsf.spec +++ b/bsf.spec @@ -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 @@ In addition, the following languages are supported with their own %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 @@ Framework. %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 @@ ant javadocs %{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,39 +131,17 @@ ln -sf ${jar} ${jar/-%{version}/}; done) %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 -* Wed Nov 05 2008 ro@suse.de -- buildignore rhino to fix build -* Mon Sep 25 2006 skh@suse.de -- don't use icecream -- use source="1.4" and target="1.4" for build with java 1.5 -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Jul 27 2005 jsmeix@suse.de -- Adjustments in the spec file. -* Mon Jul 18 2005 jsmeix@suse.de -- Current version 2.3.0 from JPackage.org -* Thu Sep 16 2004 skh@suse.de -- Fix prerequires in javadoc subpackage -* Sat Sep 04 2004 skh@suse.de -- Initial package created with version 2.3.0 (JPackage 1.5)