Accepting request 286997 from home:dmacvicar:branches:Java:packages

- add the log4j adapter to commons-logging-adapters
  (bnc#918852)

OBS-URL: https://build.opensuse.org/request/show/286997
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=18

apache-commons-logging.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 20 15:14:30 UTC 2015 - dmacvicar@suse.de
+
+- add the log4j adapter to commons-logging-adapters
+  (bnc#918852)
+
 -------------------------------------------------------------------
 Tue Aug 12 11:10:06 UTC 2014 - lnussel@suse.de
 

apache-commons-logging.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-logging
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
@@ -48,6 +48,7 @@ BuildRequires:  maven-plugin-build-helper
 BuildRequires:  maven-site-plugin
 %endif
 BuildRequires:  gpg-offline
+BuildRequires:  log4j >= 1.2
 BuildRequires:  servletapi5
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -113,7 +114,7 @@ export CLASSPATH=$(build-classpath \
                    plexus/ \
                    junit \
                   ):target/classes:target/test-classes
-ant -Dmaven.mode.offline=true dist \
+ant -Dmaven.mode.offline=true -Dlog4j12.jar=%{_javadir}/log4j.jar dist \
     -lib %{_javadir}
 %endif