rpms/tomcat
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Added javax.servlet:servlet-api depmap entry to servlet-2.5-api subpackage

Browse Source
This commit is contained in:
spike 2010-11-09 16:37:01 +01:00
parent 1bb32f30d8
commit efc584784e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tomcat6.spec
View File

@ -55,7 +55,7 @@
Name: tomcat6 Name: tomcat6
Epoch: 0 Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version} Version: %{major_version}.%{minor_version}.%{micro_version}
Release: 12%{?dist} Release: 13%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons Group: Networking/Daemons
@ -395,6 +395,11 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
%{__ln_s} %{bindir}/tomcat-juli* . %{__ln_s} %{bindir}/tomcat-juli* .
popd popd
# Generate a depmap fragment javax.servlet:servlet-api pointing to
# tomcat6-servlet-2.5-api for backwards compatibility
%add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api
mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/%{name}-servlet-api
# Install the maven metadata # Install the maven metadata
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
pushd %{packdname}/output/dist/src/res/maven pushd %{packdname}/output/dist/src/res/maven
@ -456,6 +461,7 @@ done
%post servlet-%{servletspec}-api %post servlet-%{servletspec}-api
%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \ %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500 %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
%update_maven_depmap
%post el-%{elspec}-api %post el-%{elspec}-api
%{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \ %{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \
@ -499,6 +505,7 @@ fi
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
%{_sbindir}/update-alternatives --remove servlet \ %{_sbindir}/update-alternatives --remove servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
%update_maven_depmap
fi fi
%postun el-%{elspec}-api %postun el-%{elspec}-api
@ -548,7 +555,7 @@ fi
%{homedir}/work %{homedir}/work
%{homedir}/logs %{homedir}/logs
%{homedir}/conf %{homedir}/conf
%{_mavendepmapfragdir}/* %{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/*.pom %{_mavenpomdir}/*.pom
# Exclude the POMs that are in sub-packages # Exclude the POMs that are in sub-packages
%exclude %{_mavenpomdir}/*api* %exclude %{_mavenpomdir}/*api*
@ -584,6 +591,7 @@ fi
%files servlet-%{servletspec}-api %files servlet-%{servletspec}-api
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_javadir}/%{name}-servlet-%{servletspec}*.jar %{_javadir}/%{name}-servlet-%{servletspec}*.jar
%{_mavendepmapfragdir}/%{name}-servlet-api
%{_mavenpomdir}/JPP-%{name}-servlet-api.pom %{_mavenpomdir}/JPP-%{name}-servlet-api.pom
%files el-%{elspec}-api %files el-%{elspec}-api
@ -600,6 +608,9 @@ fi
%{appdir}/sample %{appdir}/sample
%changelog %changelog
* Tue Nov 9 2010 Chris Spike <chris.spike@arcor.de> 0:6.0.26-13
- Added javax.servlet:servlet-api depmap entry to servlet-2.5-api subpackage
* Thu Oct 14 2010 David Knox <dknox@redhat.com> 0:6.0.26-12 * Thu Oct 14 2010 David Knox <dknox@redhat.com> 0:6.0.26-12
- Resolves rhbz#640686 - Upgrade of tomcat6 wipes out directories - Resolves rhbz#640686 - Upgrade of tomcat6 wipes out directories
- WARNING - Back up all files that need to be preserved before - WARNING - Back up all files that need to be preserved before