rpms/ant
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Just comment out the bsf stuff, as RHAPS does for jai, jcsh, etc

Browse Source
This commit is contained in:
gbenson 2004-11-10 12:03:39 +00:00
parent 300d1c5543
commit 2f15c3e425
1 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
ant.spec
View File

@ -1,9 +1,6 @@
%define ant_home %{_datadir}/ant
%define section free
# This flag causes the omission of the bsf subpackage.
%define no_bsf 1
Name: ant
Version: 1.6.1
Release: 1jpp_6fc
@ -63,22 +60,20 @@ Optional antlr tasks for %{name}.
%description antlr -l fr
Taches antlr optionelles pour %{name}.
%if !%{no_bsf}
%package apache-bsf
Summary: Optional apache bsf tasks for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: bsf
BuildRequires: bsf
Provides: ant-apache-bsf = %{epoch}:%{version}-%{release}
Conflicts: ant-optional-clean, ant-optional-full
#%package apache-bsf
#Summary: Optional apache bsf tasks for %{name}
#Group: Development/Build Tools
#Requires: %{name} = %{epoch}:%{version}-%{release}
#Requires: bsf
#BuildRequires: bsf
#Provides: ant-apache-bsf = %{epoch}:%{version}-%{release}
#Conflicts: ant-optional-clean, ant-optional-full
%description apache-bsf
Optional apache bsf tasks for %{name}.
#%description apache-bsf
#Optional apache bsf tasks for %{name}.
%description apache-bsf -l fr
Taches apache bsf optionelles pour %{name}.
%endif
#%description apache-bsf -l fr
#Taches apache bsf optionelles pour %{name}.
%package apache-resolver
Summary: Optional apache resolver tasks for %{name}
@ -421,9 +416,7 @@ cp -p build/lib/%{name}-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launcher
# optional jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
cp -p build/lib/%{name}-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
%if !%{no_bsf}
cp -p build/lib/%{name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
%endif
#cp -p build/lib/%{name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
cp -p build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
cp -p build/lib/%{name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
#cp -p build/lib/%{name}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
@ -498,22 +491,20 @@ fi
# -----------------------------------------------------------------------------
%if !%{no_bsf}
%post apache-bsf
if [ -f %{_sysconfdir}/%{name}.conf ]; then
mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
sed -e '/# RPM package apache-bsf$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
OPT_JAR_LIST="$OPT_JAR_LIST bsf ant/ant-apache-bsf" # RPM package apache-bsf' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
rm -f %{_sysconfdir}/%{name}.conf.tmp
fi
#%post apache-bsf
#if [ -f %{_sysconfdir}/%{name}.conf ]; then
# mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
# sed -e '/# RPM package apache-bsf$/d' -e '/^ *OPT_JAR_LIST="\$OPT_JAR_LIST"/i\
# OPT_JAR_LIST="$OPT_JAR_LIST bsf ant/ant-apache-bsf" # RPM package apache-bsf' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
# rm -f %{_sysconfdir}/%{name}.conf.tmp
#fi
%postun apache-bsf
if [ "$1" = "0" ]; then
mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
sed -e '/# RPM package apache-bsf$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
rm -f %{_sysconfdir}/%{name}.conf.tmp
fi
%endif
#%postun apache-bsf
#if [ "$1" = "0" ]; then
# mv -f %{_sysconfdir}/%{name}.conf %{_sysconfdir}/%{name}.conf.tmp
# sed -e '/# RPM package apache-bsf$/d' %{_sysconfdir}/%{name}.conf.tmp > %{_sysconfdir}/%{name}.conf
# rm -f %{_sysconfdir}/%{name}.conf.tmp
#fi
# -----------------------------------------------------------------------------
@ -840,12 +831,10 @@ fi
%{_javadir}/%{name}/%{name}-antlr.jar
%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
%if !%{no_bsf}
%files apache-bsf
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-bsf.jar
%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
%endif
#%files apache-bsf
#%defattr(0644,root,root,0755)
#%{_javadir}/%{name}/%{name}-apache-bsf.jar
#%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
%files apache-resolver
%defattr(0644,root,root,0755)