Update spec file as per fedora review
This commit is contained in:
parent
1adfd456c0
commit
daaede44f9
29
ant.spec
29
ant.spec
@ -51,7 +51,7 @@
|
||||
|
||||
Name: ant
|
||||
Version: 1.6.5
|
||||
Release: %{jpprelease}.2%{?dist}
|
||||
Release: %{jpprelease}.3%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Ant build tool for java
|
||||
Summary(it): Tool per la compilazione di programmi java
|
||||
@ -83,7 +83,6 @@ BuildRequires: xerces-j2
|
||||
BuildRequires: jaxp_parser_impl
|
||||
BuildRequires: jpackage-utils >= 0:1.6
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: coreutils
|
||||
%if ! %{bootstrap1}
|
||||
Requires: jaxp_parser_impl
|
||||
BuildRequires: jaxp_parser_impl
|
||||
@ -567,7 +566,6 @@ Summary: Additional scripts for %{name}
|
||||
Group: Development/Build Tools
|
||||
AutoReqProv: no
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: /usr/bin/perl
|
||||
Requires: /usr/bin/python
|
||||
|
||||
%description scripts
|
||||
@ -592,8 +590,6 @@ Documentation pour %{name}.
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Development/Documentation
|
||||
Requires(post): /bin/rm,/bin/ln
|
||||
Requires(postun): /bin/rm
|
||||
|
||||
%description javadoc
|
||||
Javadoc for %{name}.
|
||||
@ -697,13 +693,6 @@ cp -p build/lib/%{name}-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-trax
|
||||
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
|
||||
## endorsed jars
|
||||
#mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}/endorsed
|
||||
#pushd $RPM_BUILD_ROOT%{_javadir}/%{name}/endorsed
|
||||
#ln -sf $(build-classpath xml-commons-apis)
|
||||
#ln -sf $(build-classpath xerces-j2) jaxp_parser_impl.jar
|
||||
#popd
|
||||
|
||||
# scripts: remove dos and os/2 scripts
|
||||
rm -f src/script/*.bat
|
||||
rm -f src/script/*.cmd
|
||||
@ -752,6 +741,7 @@ echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.
|
||||
# javadoc
|
||||
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
# fix link between manual and javadoc
|
||||
(cd docs/manual; ln -sf %{_javadocdir}/%{name}-%{version} api)
|
||||
@ -767,17 +757,6 @@ 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 ]
|
||||
@ -1382,10 +1361,14 @@ fi
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadocdir}/%{name}-%{version}
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Wed Apr 25 2007 Permaine Cheung <pcheung@redhat.com> 0:1.6.5-4jpp.3
|
||||
- Update spec file as per fedora review.
|
||||
|
||||
* Mon Mar 19 2007 Permaine Cheung <pcheung@redhat.com> 1.6.5-4jpp.2
|
||||
- Get rid of the Provides for ant-optional and ant-optional-full.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user