- Silence loads of warnings by rpmlintrc
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=49
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
a106a5ac9d
commit
9fc74e4f86
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 11 09:18:07 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Silence loads of warnings by rpmlintrc
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 10 14:57:29 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
|
||||
74
tomcat.spec
74
tomcat.spec
@ -47,8 +47,6 @@ Url: http://tomcat.apache.org
|
||||
Source0: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz
|
||||
Source1: %{name}-%{major_version}.%{minor_version}.conf
|
||||
Source2: %{name}-%{major_version}.%{minor_version}.init
|
||||
# sysconfig removal - bnc#471639
|
||||
#Source3: %{name}-%{major_version}.%{minor_version}.sysconfig
|
||||
Source4: %{name}-%{major_version}.%{minor_version}.wrapper
|
||||
Source5: %{name}-%{major_version}.%{minor_version}.logrotate
|
||||
Source6: %{name}-%{major_version}.%{minor_version}-digest.script
|
||||
@ -140,7 +138,7 @@ Group: Productivity/Networking/Web/Servers
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description admin-webapps
|
||||
The host-manager and manager web applications for Apache Tomcat.
|
||||
The host-manager and manager web based applications for Apache Tomcat.
|
||||
|
||||
%package docs-webapp
|
||||
Summary: The docs web application for Apache Tomcat
|
||||
@ -148,7 +146,7 @@ Group: Productivity/Networking/Web/Servers
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description docs-webapp
|
||||
The docs web application for Apache Tomcat.
|
||||
The documentation of web application for Apache Tomcat.
|
||||
|
||||
%package el-2_2-api
|
||||
Summary: Expression Language v2.2 API
|
||||
@ -160,14 +158,14 @@ Provides: el_2_2_api = %{version}-%{release}
|
||||
Provides: el_api = %{elspec}
|
||||
|
||||
%description el-2_2-api
|
||||
Expression Language 2.2.
|
||||
Expression Language API version 2.2.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc generated documentation for Apache Tomcat
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
|
||||
%description javadoc
|
||||
Javadoc generated documentation for Apache Tomcat.
|
||||
Javadoc generated documentation files for Apache Tomcat.
|
||||
|
||||
%package jsp-2_2-api
|
||||
Summary: Apache Tomcat JSP API implementation classes
|
||||
@ -180,7 +178,7 @@ Provides: jsp = %{jspspec}
|
||||
Provides: jsp22
|
||||
|
||||
%description jsp-2_2-api
|
||||
Apache Tomcat JSP API implementation classes
|
||||
Apache Tomcat JSP API implementation classes version 2.2
|
||||
|
||||
%if %{with_systemd}
|
||||
%package jsvc
|
||||
@ -208,7 +206,7 @@ Provides: jakarta-commons-dbcp-tomcat5 = 1.4
|
||||
Obsoletes: jakarta-commons-dbcp-tomcat5 < 1.4
|
||||
|
||||
%description lib
|
||||
Libraries needed to run the Tomcat Web container
|
||||
Libraries required to successfully run the Tomcat Web container
|
||||
|
||||
%package servlet-3_0-api
|
||||
Summary: Apache Tomcat Servlet API implementation classes
|
||||
@ -221,13 +219,13 @@ Provides: servlet30
|
||||
Provides: servlet7
|
||||
|
||||
%description servlet-3_0-api
|
||||
Apache Tomcat Servlet API implementation classes
|
||||
Apache Tomcat Servlet API implementation classes version 3.0
|
||||
|
||||
%package webapps
|
||||
Summary: The ROOT and examples web applications for Apache Tomcat
|
||||
Summary: ROOT and examples web applications for Apache Tomcat
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires(post): jakarta-taglibs-standard >= 1.1
|
||||
Requires: jakarta-taglibs-standard >= 1.1
|
||||
|
||||
%description webapps
|
||||
The ROOT and examples web applications for Apache Tomcat
|
||||
@ -353,8 +351,6 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d
|
||||
%endif
|
||||
|
||||
install -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name}
|
||||
# sysconfig removal
|
||||
# % {__install} -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
|
||||
install -d -m 0755 %{buildroot}%{appdir}
|
||||
install -d -m 0755 %{buildroot}%{bindir}
|
||||
install -d -m 0755 %{buildroot}%{confdir}
|
||||
@ -386,10 +382,6 @@ sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
|
||||
-e "s|\@\@\@JAVAHOME\@\@\@|%{_sysconfdir}/alternatives/jre|g" \
|
||||
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE1} \
|
||||
> %{buildroot}%{confdir}/%{name}.conf
|
||||
# sysconfig removal
|
||||
# % {__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
|
||||
# -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" %{SOURCE3} \
|
||||
# > %{buildroot}%{_sysconfdir}/sysconfig/%{name}
|
||||
|
||||
%if %{with_systemd}
|
||||
install -m 0644 %{SOURCE11} \
|
||||
@ -399,8 +391,8 @@ install -m 0644 %{SOURCE17} \
|
||||
install -m 0644 %{SOURCE20} \
|
||||
%{buildroot}%{_unitdir}/%{name}-jsvc.service
|
||||
(cd %{buildroot}%{_sbindir}; ln -s %{name}-sysd %{name}-jsvc-sysd)
|
||||
ln -sf ../../sbin/service %{buildroot}/%{_sbindir}/rc%{name}
|
||||
ln -sf ../../sbin/service %{buildroot}/%{_sbindir}/rc%{name}-jsvc
|
||||
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
|
||||
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}-jsvc
|
||||
%else
|
||||
install -m 0755 %{SOURCE2} \
|
||||
%{buildroot}%{_initddir}/%{name}
|
||||
@ -453,7 +445,7 @@ pushd %{buildroot}%{libdir}
|
||||
ln -s $(build-classpath log4j) log4j.jar
|
||||
ln -s $(build-classpath ecj) jasper-jdt.jar
|
||||
|
||||
# Temporary copy the juli jar here from %{_datadir}/java/tomcat (for maven depmap)
|
||||
# Temporary copy the juli jar here from %%{_datadir}/java/tomcat (for maven depmap)
|
||||
cp -a %{buildroot}%{bindir}/tomcat-juli.jar ./
|
||||
popd
|
||||
|
||||
@ -545,6 +537,20 @@ echo "%{name}/catalina-ant" > %{buildroot}/%{_sysconfdir}/ant.d/catalina-ant
|
||||
#bnc#565901
|
||||
ln -sf %{_sbindir}/d%{name} %{buildroot}/%{bindir}/catalina.sh
|
||||
|
||||
# Install update-alternatives content
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||
|
||||
ln -s %{_javadir}/%{name}-el-%{elspec}-api.jar %{buildroot}%{_javadir}/el_api.jar
|
||||
ln -s %{_javadir}/%{name}-el-%{elspec}-api.jar %{buildroot}%{_sysconfdir}/alternatives/el_api.jar
|
||||
ln -s %{_javadir}/%{name}-el-%{elspec}-api.jar %{buildroot}%{_javadir}/el_1_0_api.jar
|
||||
ln -s %{_javadir}/%{name}-el-%{elspec}-api.jar %{buildroot}%{_sysconfdir}/alternatives/el_1_0_api.jar
|
||||
|
||||
ln -s %{_javadir}/%{name}-jsp-%{jspspec}-api.jar %{buildroot}%{_javadir}/jsp.jar
|
||||
ln -s %{_javadir}/%{name}-jsp-%{jspspec}-api.jar %{buildroot}%{_sysconfdir}/alternatives/jsp.jar
|
||||
|
||||
ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{buildroot}%{_javadir}/servlet.jar
|
||||
ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{buildroot}%{_sysconfdir}/alternatives/servlet.jar
|
||||
|
||||
%pre
|
||||
# add the tomcat user and group
|
||||
%{_sbindir}/groupadd -r tomcat 2>/dev/null || :
|
||||
@ -562,13 +568,10 @@ ln -sf %{_sbindir}/d%{name} %{buildroot}/%{bindir}/catalina.sh
|
||||
%endif
|
||||
|
||||
%preun
|
||||
if [ -x %{_initddir}/%{name} ]; then
|
||||
# clean tempdir and cachedir on removal or upgrade
|
||||
## % {__rm} -rf %{workdir}/* %{tempdir}/*
|
||||
%stop_on_removal %{name}
|
||||
fi
|
||||
%if %{with_systemd}
|
||||
%service_del_preun %{name}.service
|
||||
%else
|
||||
%stop_on_removal %{name}
|
||||
%endif
|
||||
|
||||
%postun
|
||||
@ -580,7 +583,6 @@ fi
|
||||
%endif
|
||||
|
||||
%if %{with_systemd}
|
||||
|
||||
%pre jsvc
|
||||
%service_add_pre %{name}-jsvc.service
|
||||
|
||||
@ -599,7 +601,7 @@ fi
|
||||
%{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
|
||||
|
||||
%preun el-2_2-api
|
||||
if [ "$1" = "0" ]; then
|
||||
if [ $1 -eq 0 ] ; then
|
||||
%{_sbindir}/update-alternatives --remove el_api %{_javadir}/%{name}-el-%{elspec}-api.jar
|
||||
%{_sbindir}/update-alternatives --remove el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar
|
||||
fi
|
||||
@ -609,7 +611,7 @@ fi
|
||||
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200
|
||||
|
||||
%postun jsp-2_2-api
|
||||
if [ "$1" = "0" ]; then
|
||||
if [ $1 -eq 0 ] ; then
|
||||
%{_sbindir}/update-alternatives --remove jsp \
|
||||
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
|
||||
fi
|
||||
@ -619,7 +621,7 @@ fi
|
||||
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
|
||||
|
||||
%postun servlet-3_0-api
|
||||
if [ "$1" = "0" ]; then
|
||||
if [ $1 -eq 0 ] ; then
|
||||
%{_sbindir}/update-alternatives --remove servlet \
|
||||
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
|
||||
fi
|
||||
@ -638,7 +640,6 @@ rm -f \
|
||||
%attr(0755,root,root) %{_bindir}/%{name}-digest
|
||||
%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper
|
||||
%attr(0755,root,root) %{_sbindir}/d%{name}
|
||||
# % attr(0755,root,root) %{_sbindir}/%{name}
|
||||
%if %{with_systemd}
|
||||
%attr(0644,root,root) %{_unitdir}/%{name}.service
|
||||
%attr(0755,root,root) %{_sbindir}/%{name}-sysd
|
||||
@ -650,12 +651,9 @@ rm -f \
|
||||
%if ! %{with_systemd}
|
||||
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
||||
%endif
|
||||
# sysconfig removal
|
||||
# % config(noreplace) %{_sysconfdir}/sysconfig/%{name}
|
||||
# bnc#726307
|
||||
%attr(0775,root,tomcat) %dir %{confdir}
|
||||
%{confdir}/Catalina
|
||||
# % attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
|
||||
%config(noreplace) %{confdir}/%{name}.conf
|
||||
%config(noreplace) %{confdir}/*.policy
|
||||
%config(noreplace) %{confdir}/*.properties
|
||||
@ -698,6 +696,10 @@ rm -f \
|
||||
%{libdir}/%{name}-el-%{elspec}-api.jar
|
||||
%{_mavenpomdir}/JPP-%{name}-el-api.pom
|
||||
%{_mavendepmapfragdir}/%{name}-tomcat-el-api
|
||||
%ghost %{_javadir}/el_1_0_api.jar
|
||||
%ghost %{_javadir}/el_api.jar
|
||||
%ghost %{_sysconfdir}/alternatives/el_1_0_api.jar
|
||||
%ghost %{_sysconfdir}/alternatives/el_api.jar
|
||||
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
@ -707,7 +709,8 @@ rm -f \
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
|
||||
%{_javadir}/%{name}-jsp-api.jar
|
||||
# % ghost %{_javadir}/jsp.jar
|
||||
%ghost %{_javadir}/jsp.jar
|
||||
%ghost %{_sysconfdir}/alternatives/jsp.jar
|
||||
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
|
||||
%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
|
||||
|
||||
@ -737,7 +740,8 @@ rm -f \
|
||||
%doc LICENSE
|
||||
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
|
||||
%{_javadir}/%{name}-servlet-api.jar
|
||||
# % ghost %{_javadir}/servlet.jar
|
||||
%ghost %{_javadir}/servlet.jar
|
||||
%ghost %{_sysconfdir}/alternatives/servlet.jar
|
||||
%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
|
||||
%{_mavenpomdir}/JPP-%{name}-servlet-api.pom
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user