Author: qboosh Date: Sat Feb 12 09:00:22 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- don't force gcj
- use subver macro instead of _beta
---- Files affected:
packages/java-beanshell:
java-beanshell.spec (1.18 -> 1.19)
---- Diffs:
================================================================
Index: packages/java-beanshell/java-beanshell.spec
diff -u packages/java-beanshell/java-beanshell.spec:1.18
packages/java-beanshell/java-beanshell.spec:1.19
--- packages/java-beanshell/java-beanshell.spec:1.18 Fri Feb 6 00:10:27 2009
+++ packages/java-beanshell/java-beanshell.spec Sat Feb 12 10:00:17 2011
@@ -3,24 +3,23 @@
# Conditional build:
%bcond_without bsf # without BSF support
#
-%define _beta b4
%define srcname beanshell
%include /usr/lib/rpm/macros.java
Summary: BeanShell - Lightweight Scripting for Java
Summary(pl.UTF-8): BeanShell - lekkie skrypty dla Javy
Name: java-beanshell
Version: 2.0
-Release: 0.%{_beta}.4
-License: Sun Public License or LGPL
+%define subver b4
+Release: 0.%{subver}.4
+License: Sun Public License v1.0 or LGPL
Group: Development/Languages/Java
-Source0: http://www.beanshell.org/bsh-%{version}%{_beta}-src.jar
+Source0: http://www.beanshell.org/bsh-%{version}%{subver}-src.jar
# Source0-md5: 49c9cc9872f26d562bffb1e5ec8aa377
Source1: %{name}.sh
URL: http://www.beanshell.org/
BuildRequires: ant >= 1.3
BuildRequires: antlr
-%{?with_bsf:BuildRequires: bsf}
-BuildRequires: java-gcj-compat-devel
+%{?with_bsf:BuildRequires: java-bsf}
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
@@ -69,7 +68,7 @@
Skrypt powłoki uruchamiający beanshell jako niezależną aplikację.
%prep
-%setup -q -n BeanShell-%{version}%{_beta}
+%setup -q -n BeanShell-%{version}%{subver}
%build
required_jars="%{?with_bsf:bsf}"
@@ -78,7 +77,6 @@
export SHELL=/bin/sh
%ant jarall javadoc \
- -Dbuild.compiler=gcj \
%{!?with_bsf:-Dexclude-bsf='bsh/util/BeanShellBSFEngine.java,TestBshBSF.java'}
cp -R docs/manual/html manual
@@ -88,8 +86,8 @@
install -d
$RPM_BUILD_ROOT{%{_bindir},%{_javadir},%{_javadocdir}/%{name}-%{version}}
# jars
-install dist/bsh-%{version}%{_beta}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -sf bsh-%{version}%{_beta}.jar $RPM_BUILD_ROOT%{_javadir}/bsh.jar
+install dist/bsh-%{version}%{subver}.jar $RPM_BUILD_ROOT%{_javadir}
+ln -sf bsh-%{version}%{subver}.jar $RPM_BUILD_ROOT%{_javadir}/bsh.jar
cp -a javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
@@ -104,9 +102,9 @@
%files
%defattr(644,root,root,755)
-%doc asm/README-asm.txt bsf/README src/{*.html,*.txt}
-%doc docs/{faq/faq.html,images,manual}
-%{_javadir}/*.jar
+%doc asm/README-asm.txt bsf/README src/{*.html,*.txt}
docs/{faq/faq.html,images,manual}
+%{_javadir}/bsh-%{version}%{subver}.jar
+%{_javadir}/bsh.jar
%files javadoc
%defattr(644,root,root,755)
@@ -123,6 +121,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.19 2011/02/12 09:00:17 qboosh
+- don't force gcj
+- use subver macro instead of _beta
+
Revision 1.18 2009/02/05 23:10:27 pawelz
- simplified
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-beanshell/java-beanshell.spec?r1=1.18&r2=1.19&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
