[packages/solr] nail logging: install all slf jars, depend on log4j

glen glen at pld-linux.org
Wed Mar 5 14:38:01 CET 2014


commit 179753b3c415c44931ef199ae11fbb971540f10e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 5 15:37:13 2014 +0200

    nail logging: install all slf jars, depend on log4j

 solr.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/solr.spec b/solr.spec
index e51601d..533939b 100644
--- a/solr.spec
+++ b/solr.spec
@@ -27,6 +27,7 @@ BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	java-%{name} = %{version}-%{release}
+Requires:	java-log4j
 Requires:	java-slf4j >= 1.6
 Requires:	jpackage-utils
 Requires:	tomcat
@@ -105,8 +106,10 @@ cp -a war/* $RPM_BUILD_ROOT%{webappdir}
 
 # get logging jars to tomcat to load
 # http://wiki.apache.org/solr/SolrLogging
-for jar in slf4j-api.jar jcl-over-slf4j.jar; do
-	ln -s %{_javadir}/$jar $RPM_BUILD_ROOT%{webappdir}/WEB-INF/lib
+for jar in \
+	log4j jcl-over-slf4j jul-to-slf4j slf4j-api slf4j-log4j12 \
+	; do
+	ln -s %{_javadir}/$jar.jar $RPM_BUILD_ROOT%{webappdir}/WEB-INF/lib
 done
 
 # install tomcat context descriptor
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/solr.git/commitdiff/179753b3c415c44931ef199ae11fbb971540f10e



More information about the pld-cvs-commit mailing list