Fixes according to latest guidelines
- Fix maven depmap
This commit is contained in:
parent
85d7b4c990
commit
d4c14ccfea
47
bsf.spec
47
bsf.spec
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
Name: bsf
|
Name: bsf
|
||||||
Version: 2.4.0
|
Version: 2.4.0
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
Summary: Bean Scripting Framework
|
Summary: Bean Scripting Framework
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
@ -48,15 +48,12 @@ BuildRequires: xalan-j2
|
|||||||
BuildRequires: jython
|
BuildRequires: jython
|
||||||
BuildRequires: apache-commons-logging
|
BuildRequires: apache-commons-logging
|
||||||
BuildRequires: rhino
|
BuildRequires: rhino
|
||||||
Requires: apache-commons-logging
|
Requires: apache-commons-logging
|
||||||
Requires: servlet6
|
Requires: servlet6
|
||||||
Requires: xalan-j2
|
Requires: xalan-j2
|
||||||
Requires: tomcat6-jsp-2.1-api
|
Requires: tomcat6-jsp-2.1-api
|
||||||
Requires: jpackage-utils
|
Requires: jpackage-utils
|
||||||
Requires(post): jpackage-utils
|
|
||||||
Requires(postun): jpackage-utils
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Bean Scripting Framework (BSF) is a set of Java classes which provides
|
Bean Scripting Framework (BSF) is a set of Java classes which provides
|
||||||
@ -87,6 +84,7 @@ engines:
|
|||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: Javadoc for %{name}
|
Summary: Javadoc for %{name}
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
|
Requires: jpackage-utils
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
Javadoc for %{name}.
|
Javadoc for %{name}.
|
||||||
@ -112,41 +110,34 @@ ant javadocs
|
|||||||
# jar
|
# jar
|
||||||
%{__install} -d -m 755 %{buildroot}%{_javadir}
|
%{__install} -d -m 755 %{buildroot}%{_javadir}
|
||||||
%{__install} -m 644 build/lib/%{name}.jar \
|
%{__install} -m 644 build/lib/%{name}.jar \
|
||||||
%{buildroot}%{_javadir}/%{name}-%{version}.jar
|
%{buildroot}%{_javadir}/%{name}.jar
|
||||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
|
|
||||||
ln -sf ${jar} ${jar/-%{version}/}; done)
|
|
||||||
# javadoc
|
# javadoc
|
||||||
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
|
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
%{__cp} -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
|
%{__cp} -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
|
||||||
(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
|
|
||||||
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
|
|
||||||
|
|
||||||
%{__install} -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
%{__install} -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||||
%add_to_maven_depmap org.apache.bsf %{name} %{version} JPP %{name}
|
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.bsf:%{name}"
|
||||||
|
|
||||||
%post
|
%pre javadoc
|
||||||
%update_maven_depmap
|
# workaround for rpm bug, can be removed in F-20
|
||||||
|
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
|
||||||
%postun
|
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
||||||
%update_maven_depmap
|
|
||||||
|
|
||||||
%clean
|
|
||||||
%{__rm} -rf %{buildroot}
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
|
||||||
%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
|
%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
|
||||||
%{_javadir}/*
|
%{_javadir}/%{name}.jar
|
||||||
%{_mavenpomdir}/*
|
%{_mavenpomdir}/JPP-%{name}.pom
|
||||||
%{_mavendepmapfragdir}/*
|
%{_mavendepmapfragdir}/%{name}
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr(-,root,root)
|
%doc LICENSE.txt NOTICE.txt
|
||||||
%dir %{_javadocdir}/%{name}-%{version}
|
|
||||||
%{_javadocdir}/%{name}-%{version}/*
|
|
||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 2 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.4.0-10
|
||||||
|
- Fixes according to latest guidelines
|
||||||
|
- Fix maven depmap
|
||||||
|
|
||||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.4.0-9
|
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.4.0-9
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user