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

Revert "Removed log4j sub-package with bundled log4j (replaced by system symlink)"

Browse Source 
This reverts commit 5746174c03.

Conflicts:
	tomcat6.spec
This commit is contained in:
Ivan Afonichev 2014-03-28 02:46:09 +04:00
parent cee7beed0a
commit e4eaf9df8e
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tomcat.spec
View File

@ -175,6 +175,13 @@ Requires(postun): chkconfig
%description jsp-%{jspspec}-api %description jsp-%{jspspec}-api
Apache Tomcat JSP API implementation classes. Apache Tomcat JSP API implementation classes.
%package log4j
Group: Applications/Internet
Summary: Log4j support for Apache Tomcat
Requires: log4j
%description log4j
Log4j support for Apache Tomcat
%package lib %package lib
Group: Development/Libraries Group: Development/Libraries
@ -596,6 +603,8 @@ fi
%{homedir}/logs %{homedir}/logs
%{homedir}/conf %{homedir}/conf
%exclude %{confdir}/log4j.properties
%files admin-webapps %files admin-webapps
%defattr(0664,root,tomcat,0755) %defattr(0664,root,tomcat,0755)
%{appdir}/host-manager %{appdir}/host-manager
@ -616,6 +625,11 @@ fi
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom %{_mavenpomdir}/JPP-%{name}-jsp-api.pom
%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api %{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
%files log4j
%defattr(0664,root,tomcat,0755)
%config(noreplace) %{confdir}/log4j.properties
%{libdir}/log4j.jar
%files lib %files lib
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{libdir} %{libdir}
@ -635,6 +649,7 @@ fi
%exclude %{libdir}/%{name}-el-%{elspec}-api.jar %exclude %{libdir}/%{name}-el-%{elspec}-api.jar
%exclude %{libdir}/log4j.jar
%files servlet-%{servletspec}-api %files servlet-%{servletspec}-api
%defattr(-,root,root,-) %defattr(-,root,root,-)