- Merge with upstream

- Removed unapplied patch and moved buildroot removal from prep to install,
    and other rpmlint cleanup
This commit is contained in:
Permaine Cheung 2007-03-16 15:51:11 +00:00
parent 1acbabcf34
commit 303ff4b9d4
3 changed files with 44 additions and 21 deletions

View File

@ -1,4 +1 @@
bsh-1.3.0-src.tar.bz2
BeanShell
noarch
*.src.rpm

View File

@ -32,32 +32,33 @@
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
%define section free
Name: bsh
Version: 1.3.0
Release: 9jpp.2
Epoch: 0
Release: 10jpp.1%{?dist}
Epoch: 0
Summary: Lightweight Scripting for Java
License: LGPL
Source0: %{name}-%{version}-src.tar.bz2
Patch0: %{name}-build.patch
Patch1: %{name}-readline.patch
#cvs -d:pserver:anonymous@beanshell.cvs.sourceforge.net:/cvsroot/beanshell login
#cvs -z3 -d:pserver:anonymous@beanshell.cvs.sourceforge.net:/cvsroot/beanshell export -r rel_1_3_0_final BeanShell
#tar cjf bsh-1.3.0-src.tar.bz2 BeanShell
Patch0: %{name}-build.patch
#Patch1: %{name}-readline.patch
BuildRequires: ant, bsf, perl, ant-trax
Requires: bsf
Requires: jpackage-utils >= 0:1.6
Requires: bsf
Requires: jpackage-utils >= 0:1.6
#BuildRequires: libreadline-java
Url: http://www.beanshell.org/
Group: Development/Java
%if ! %{gcj_support}
Buildarch: noarch
%endif
Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
%endif
%description
@ -98,15 +99,14 @@ Javadoc for %{name}.
%package demo
Summary: Demo for %{name}
Group: Development/Java
AutoReqProv: no
AutoReqProv: no
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: /usr/bin/env
Requires: /usr/bin/env
%description demo
Demonstrations and samples for %{name}.
%prep
rm -rf $RPM_BUILD_ROOT
%setup -q -n BeanShell
%patch0 -p1
#%patch1 -p1
@ -114,6 +114,10 @@ find . -name "*.jar" -exec rm -f {} \;
# remove all CVS files
for dir in `find . -type d -name CVS`; do rm -rf $dir; done
for file in `find . -type f -name .cvsignore`; do rm -rf $file; done
# fix rpmlint spurious-executable-perm warnings
for i in backbutton forwardbutton homebutton remoteconsole upbutton; do
chmod 644 docs/images/$i.gif
done
%build
mkdir -p lib
@ -129,6 +133,7 @@ ant -Dexclude-servlet='bsh/servlet/*' bshdoc
(cd docs/manual && ant)
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
@ -151,6 +156,21 @@ for i in `find tests -name \*.bsh`; do
chmod 755 $i
fi
done
chmod 755 tests/Template
cat > one << EOF
#!/bin/sh
EOF
cat tests/Interactive/reload/one >> one
cat one > tests/Interactive/reload/one
rm one
cat > two << EOF
#!/bin/sh
EOF
cat tests/Interactive/reload/two >> two
cat two > tests/Interactive/reload/two
rm two
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr tests $RPM_BUILD_ROOT%{_datadir}/%{name}
# scripts
@ -220,16 +240,16 @@ if [ "$1" = "0" ]; then
rm -f %{_javadocdir}/%{name}
fi
%post
%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%postun
%if %{gcj_support}
%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@ -258,9 +278,15 @@ fi
%files demo
%defattr(-,root,root)
%doc tests/README.txt tests/Interactive/README
%{_datadir}/%{name}/*
%changelog
* Fri Mar 16 2007 Permaine Cheung <pcheung@redhat.com> 0:1.3.0-10jpp.1
- Merge with upstream
- Removed unapplied patch and moved buildroot removal from prep to install,
and other rpmlint cleanup
* Mon Mar 12 2007 Karsten Hopp <karsten@redhat.com> 1.3.0-9jpp.2
- add buildrequirement ant-trax for documentation

View File

@ -1 +1 @@
8ecaff8eb679e4f1447dbb98cc9e897a bsh-1.3.0-src.tar.bz2
3d8c14c2a223aa577108efa8bd17bdd3 bsh-1.3.0-src.tar.bz2