Fix bz602955 and small cleanups

This commit is contained in:
Stanislav Ochotnicky 2010-06-14 11:24:03 +00:00
parent 3f842fcb7d
commit 884896cb17
1 changed files with 24 additions and 6 deletions

View File

@ -30,15 +30,15 @@
Name: bsf
Version: 2.4.0
Release: 6%{?dist}
Release: 7%{?dist}
Epoch: 0
Summary: Bean Scripting Framework
License: ASL 2.0
URL: http://jakarta.apache.org/bsf/
Group: Development/Libraries/Java
#http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
Source0: %{name}-src-%{version}.tar.gz
Patch0: build-file.patch
Group: Development/Libraries
Source0: http://apache.osuosl.org/jakarta/%{name}/source/%{name}-src-%{version}.tar.gz
Source1: %{name}-pom.xml
Patch0: build-file.patch
Patch1: build.properties.patch
BuildRequires: jpackage-utils >= 1.6
BuildRequires: ant
@ -52,6 +52,8 @@ Requires: servlet6
Requires: xalan-j2
Requires: tomcat6-jsp-2.1-api
Requires: jpackage-utils
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -83,7 +85,7 @@ engines:
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Group: Documentation
%description javadoc
Javadoc for %{name}.
@ -118,6 +120,15 @@ ln -sf ${jar} ${jar/-%{version}/}; done)
(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%{__install} -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.bsf %{name} %{version} JPP %{name}
%post
%update_maven_depmap
%postun
%update_maven_depmap
%clean
%{__rm} -rf %{buildroot}
@ -125,6 +136,8 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%defattr(-,root,root)
%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root)
@ -133,6 +146,11 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
* Mon Jun 14 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.4.0-7
- Added pom file to enable maven dependency resolution
- Fix Source0 URL
- Fix Group designation
* Mon Jun 7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.4.0-6
- Fix BR after jakarta-commons rename