Update spec file as per Fedora guidelines

This commit is contained in:
Permaine Cheung 2007-04-26 16:24:45 +00:00
parent 713217bff5
commit 2f4c3b43b8

View File

@ -41,7 +41,6 @@ License: Apache License
Url: http://jakarta.apache.org/bsf/ Url: http://jakarta.apache.org/bsf/
Group: Development/Libraries/Java Group: Development/Libraries/Java
#http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz #http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
#Source0: %{name}-src-%{version}-RHCLEAN.tar.bz2
Source0: %{name}-src-%{version}.tar.gz Source0: %{name}-src-%{version}.tar.gz
Patch1: %{name}-javac.patch Patch1: %{name}-javac.patch
BuildRequires: jpackage-utils >= 1.6 BuildRequires: jpackage-utils >= 1.6
@ -52,6 +51,7 @@ BuildRequires: xalan-j2
Requires: servletapi5 Requires: servletapi5
Requires: xalan-j2 Requires: xalan-j2
Requires: tomcat5-jsp-2.0-api Requires: tomcat5-jsp-2.0-api
Requires: jpackage-utils
%if ! %{gcj_support} %if ! %{gcj_support}
BuildArch: noarch BuildArch: noarch
%endif %endif
@ -92,8 +92,6 @@ engines:
%package javadoc %package javadoc
Summary: Javadoc for %{name} Summary: Javadoc for %{name}
Group: Development/Documentation Group: Development/Documentation
Requires(post): /bin/rm,/bin/ln
Requires(postun): /bin/rm
%description javadoc %description javadoc
Javadoc for %{name}. Javadoc for %{name}.
@ -127,6 +125,7 @@ ln -sf ${jar} ${jar/-%{version}/}; done)
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} %{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
%{__cp} -pr src/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version} %{__cp} -pr src/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name}) (cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%if %{gcj_support} %if %{gcj_support}
%{_bindir}/aot-compile-rpm %{_bindir}/aot-compile-rpm
@ -135,15 +134,6 @@ ln -sf ${jar} ${jar/-%{version}/}; done)
%clean %clean
%{__rm} -rf %{buildroot} %{__rm} -rf %{buildroot}
%post javadoc
%{__rm} -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}
%postun javadoc
if [ $1 -eq 0 ]; then
%{__rm} -f %{_javadocdir}/%{name}
fi
%post %post
%if %{gcj_support} %if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ] if [ -x %{_bindir}/rebuild-gcj-db ]
@ -162,7 +152,7 @@ fi
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc license.txt src/AUTHORS src/BUILDING src/CHANGES src/CHANGES.old src/INSTALL src/README src/TODO %doc license.txt src/AUTHORS src/CHANGES src/CHANGES.old src/README src/TODO
%{_javadir}/* %{_javadir}/*
%if %{gcj_support} %if %{gcj_support}
@ -173,11 +163,11 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_javadocdir}/%{name}-%{version} %dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}-%{version}/* %{_javadocdir}/%{name}-%{version}/*
%ghost %{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog
* Wed Mar 07 2007 Permaine Cheung <dbhole@redhat.com> 0:2.3.0-11jpp.2 * Wed Mar 07 2007 Permaine Cheung <pcheung@redhat.com> 0:2.3.0-11jpp.2
- Update spec file as per Fedora guidelines. - Update spec file as per Fedora guidelines
* Thu Aug 03 2006 Deepak Bhole <dbhole@redhat.com> 0:2.3.0-11jpp.1 * Thu Aug 03 2006 Deepak Bhole <dbhole@redhat.com> 0:2.3.0-11jpp.1
- Added missing requirements. - Added missing requirements.