[java-sig-commits] [tomcat: 39/66] Removed log4j sub-package with bundled log4j (replaced by system symlink)
Ivan Afonichev
van at fedoraproject.org
Wed May 25 21:31:44 UTC 2011
commit 5746174c039169deb2a1032b2b03bada4dc77f75
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Thu Dec 2 17:13:44 2010 +0100
Removed log4j sub-package with bundled log4j (replaced by system symlink)
tomcat6.spec | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 969b8b4..666ca62 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -106,6 +106,9 @@ Requires(preun): /lib/lsb/init-functions
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
+# added after log4j sub-package was removed
+Provides: %{name}-log4j = %{epoch}:%{version}-%{release}
+
%description
Tomcat is the servlet container that is used in the official Reference
Implementation for the Java Servlet and JavaServer Pages technologies.
@@ -152,14 +155,6 @@ Requires(postun): %{_sbindir}/update-alternatives
Apache Tomcat JSP API implementation classes.
-%package log4j
-Group: Internet/WWW/Dynamic Content
-Summary: Log4j support for Apache Tomcat
-Requires: jakarta-commons-logging
-
-%description log4j
-Log4j support for Apache Tomcat
-
%package lib
Group: Development/Compilers
Summary: Libraries needed to run the Tomcat Web container
@@ -531,6 +526,7 @@ fi
%config(noreplace) %{confdir}/*.properties
%config(noreplace) %{confdir}/context.xml
%config(noreplace) %{confdir}/server.xml
+%config(noreplace) %{confdir}/log4j.properties
%attr(0664,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
%config(noreplace) %{confdir}/web.xml
%attr(0765,tomcat,root) %dir %{cachedir}
@@ -573,12 +569,6 @@ fi
%{_javadir}/%{name}-jsp-%{jspspec}*.jar
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
-%files log4j
-%defattr(0644,root,tomcat,0775)
-%config(noreplace) %{confdir}/log4j.properties
-%{libdir}/log4j.jar
-%{libdir}/log4j-%{version}.jar
-
%files lib
%defattr(0644,root,root,0755)
%{libdir}
More information about the java-sig-commits
mailing list