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

Add api jars without spec version symlinks

Browse Source 
- Remove clean section
- Remove whitespaces at the EOLs
This commit is contained in:
Stanislav Ochotnicky 2010-12-08 10:41:11 +01:00
parent 3c9662b660
commit fb3cd5e3ce
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
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: 17%{?dist} Release: 18%{?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
@ -265,7 +265,6 @@ touch META-INF/MANIFEST.MF
zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
%install %install
%{__rm} -rf $RPM_BUILD_ROOT
# build initial path structure # build initial path structure
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir}
@ -321,8 +320,11 @@ popd
# create jsp and servlet API symlinks # create jsp and servlet API symlinks
pushd ${RPM_BUILD_ROOT}%{_javadir} pushd ${RPM_BUILD_ROOT}%{_javadir}
%{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar
%{__ln_s} %{name}-jsp-%{jspspec}-api.jar %{name}-jsp-api.jar
%{__mv} %{name}/servlet-api.jar %{name}-servlet-%{servletspec}-api.jar %{__mv} %{name}/servlet-api.jar %{name}-servlet-%{servletspec}-api.jar
%{__ln_s} %{name}-servlet-%{servletspec}-api.jar %{name}-servlet-api.jar
%{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api.jar %{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api.jar
%{__ln_s} %{name}-el-%{elspec}-api.jar %{name}-el-api.jar
popd popd
pushd %{packdname}/output/build pushd %{packdname}/output/build
@ -338,7 +340,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
# symlink JSP and servlet API jars # symlink JSP and servlet API jars
%{__ln_s} ../%{name}-jsp-%{jspspec}-api.jar . %{__ln_s} ../%{name}-jsp-%{jspspec}-api.jar .
%{__ln_s} ../%{name}-servlet-%{servletspec}-api.jar . %{__ln_s} ../%{name}-servlet-%{servletspec}-api.jar .
%{__ln_s} ../%{name}-el-%{elspec}-api.jar %{__ln_s} ../%{name}-el-%{elspec}-api.jar .
%{__ln_s} $(build-classpath apache-commons-collections) commons-collections.jar %{__ln_s} $(build-classpath apache-commons-collections) commons-collections.jar
%{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar
%{__ln_s} $(build-classpath log4j) log4j.jar %{__ln_s} $(build-classpath log4j) log4j.jar
@ -404,10 +406,6 @@ done
%add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli %add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%pre %pre
# add the tomcat user and group # add the tomcat user and group
%{_sbindir}/groupadd -g %{tcuid} -r tomcat 2>/dev/null || : %{_sbindir}/groupadd -g %{tcuid} -r tomcat 2>/dev/null || :
@ -544,6 +542,7 @@ fi
%files jsp-%{jspspec}-api %files jsp-%{jspspec}-api
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_javadir}/%{name}-jsp-%{jspspec}*.jar %{_javadir}/%{name}-jsp-%{jspspec}*.jar
%{_javadir}/%{name}-jsp-api.jar
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom %{_mavenpomdir}/JPP-%{name}-jsp-api.pom
%files lib %files lib
@ -553,13 +552,14 @@ fi
%files servlet-%{servletspec}-api %files servlet-%{servletspec}-api
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_javadir}/%{name}-servlet-%{servletspec}*.jar %{_javadir}/%{name}-servlet-%{servletspec}*.jar
%{_javadir}/%{name}-servlet-api.jar
%{_mavendepmapfragdir}/%{name}-servlet-api %{_mavendepmapfragdir}/%{name}-servlet-api
%{_mavenpomdir}/JPP-%{name}-servlet-api.pom %{_mavenpomdir}/JPP-%{name}-servlet-api.pom
%files el-%{elspec}-api %files el-%{elspec}-api
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_javadir}/%{name}-el-%{elspec}-api.jar %{_javadir}/%{name}-el-%{elspec}-api.jar
%{_javadir}/%{name}-el-%{elspec}-api.jar %{_javadir}/%{name}-el-api.jar
%{_javadir}/%{name}/%{name}-el-%{elspec}-api.jar %{_javadir}/%{name}/%{name}-el-%{elspec}-api.jar
%{_mavenpomdir}/JPP-%{name}-el-api.pom %{_mavenpomdir}/JPP-%{name}-el-api.pom
@ -570,6 +570,11 @@ fi
%{appdir}/sample %{appdir}/sample
%changelog %changelog
* Wed Dec 8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:6.0.26-18
- Add api jars without spec version symlinks
- Remove clean section
- Remove whitespaces at the EOLs
* Mon Dec 6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:6.0.26-17 * Mon Dec 6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:6.0.26-17
- Add jetty to servlet-api depmap - Add jetty to servlet-api depmap