Update spec file as per fedora review process
This commit is contained in:
parent
303ff4b9d4
commit
1192965652
18
bsh.spec
18
bsh.spec
@ -1,4 +1,4 @@
|
||||
# Copyright (c) 2000-2005, JPackage Project
|
||||
# Copyright (c) 2000-2007, JPackage Project
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
@ -44,7 +44,7 @@ Source0: %{name}-%{version}-src.tar.bz2
|
||||
#tar cjf bsh-1.3.0-src.tar.bz2 BeanShell
|
||||
Patch0: %{name}-build.patch
|
||||
#Patch1: %{name}-readline.patch
|
||||
BuildRequires: ant, bsf, perl, ant-trax
|
||||
BuildRequires: ant, bsf, ant-trax
|
||||
Requires: bsf
|
||||
Requires: jpackage-utils >= 0:1.6
|
||||
#BuildRequires: libreadline-java
|
||||
@ -90,8 +90,6 @@ Documentation for %{name}.
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Development/Java
|
||||
Requires(post): /bin/rm,/bin/ln
|
||||
Requires(postun): /bin/rm
|
||||
|
||||
%description javadoc
|
||||
Javadoc for %{name}.
|
||||
@ -149,6 +147,8 @@ find docs -name "*.log" -exec rm -f {} \;
|
||||
# javadoc
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
# demo
|
||||
for i in `find tests -name \*.bsh`; do
|
||||
perl -p -i -e 's,^\n?#!(/(usr/)?bin/java bsh\.Interpreter|/bin/sh),#!/usr/bin/env %{_bindir}/%{name},' $i
|
||||
@ -231,15 +231,6 @@ cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post javadoc
|
||||
rm -f %{_javadocdir}/%{name}
|
||||
ln -s %{name}-%{version} %{_javadocdir}/%{name}
|
||||
|
||||
%postun javadoc
|
||||
if [ "$1" = "0" ]; then
|
||||
rm -f %{_javadocdir}/%{name}
|
||||
fi
|
||||
|
||||
%if %{gcj_support}
|
||||
%post
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
@ -275,6 +266,7 @@ fi
|
||||
%files javadoc
|
||||
%defattr(-,root,root)
|
||||
%{_javadocdir}/%{name}-%{version}
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%files demo
|
||||
%defattr(-,root,root)
|
||||
|
Loading…
Reference in New Issue
Block a user