diff --git a/9.0.73.tar.gz b/9.0.75.tar.gz similarity index 46% rename from 9.0.73.tar.gz rename to 9.0.75.tar.gz index 3f11499d518ce863f8b735fd16726d3b0049cd9c..9cc5c48f55a44c74c0b793b24527a0e110e26353 100644 Binary files a/9.0.73.tar.gz and b/9.0.75.tar.gz differ diff --git a/tomcat.spec b/tomcat.spec index b392ab888056b72a6c57f6ce33f1d3e5c5d43268..38ac106da874b9e6991ed1f93ce541265ec594d2 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,9 +1,9 @@ -%define anolis_release 2 +%define anolis_release 1 %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 73 +%global micro_version 75 %global packdname tomcat-%{version} %global servletspec 4.0 %global elspec 3.0 @@ -27,7 +27,7 @@ Name: tomcat Epoch: 1 -Version: 9.0.73 +Version: %{major_version}.%{minor_version}.%{micro_version} Release: %{anolis_release}%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API @@ -235,25 +235,25 @@ touch HACK %install # build initial path structure -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{_bindir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{_sbindir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{_systemddir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{appdir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{bindir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{confdir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{confdir}/conf.d +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_systemddir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{bindir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/conf.d /bin/echo "Place your custom *.conf files here. Shell expansion is supported." > ${RPM_BUILD_ROOT}%{confdir}/conf.d/README -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{libdir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{logdir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tomcats -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{homedir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{tempdir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{workdir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{_unitdir} -%{__install} -m 0775 -d ${RPM_BUILD_ROOT}%{_libexecdir}/%{name} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tomcats +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir} +%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_unitdir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_libexecdir}/%{name} # move things into place # First copy supporting libs to tomcat lib @@ -338,7 +338,7 @@ pushd ${RPM_BUILD_ROOT}%{homedir} popd # Install the maven metadata for the spec impl artifacts as other projects use them -#%{__install} -m 0644 -p ${RPM_BUILD_ROOT}%{_mavenpomdir} +#%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir} pushd res/maven for pom in tomcat-el-api.pom tomcat-jsp-api.pom tomcat-servlet-api.pom; do # fix-up version in all pom files @@ -352,6 +352,8 @@ popd %mvn_artifact res/maven/tomcat-servlet-api.pom output/build/lib/servlet-api.jar %mvn_install +sed -i '/usr\/share\/java\/tomcat$/d' .mfiles-tomcat-jsp-api + %pre # add the tomcat user and group getent group tomcat >/dev/null || %{_sbindir}/groupadd -f -g %{tcuid} -r tomcat @@ -496,6 +498,9 @@ fi %doc {NOTICE,RELEASE*} %changelog +* Mon May 8 2023 Funda Wang - 9.0.75-1 +- New version 9.0.75 + * Wed Apr 12 2023 Xuchun Shang - 1:9.0.73-2 - Optimize the spec