[freemarker] update patch for logging nb #156876

Omair Majid omajid at fedoraproject.org
Wed Jun 27 20:58:51 UTC 2012


commit da65ad1309e64f6b6acec86aa5e304d36b985ec1
Author: gil <puntogil at libero.it>
Date:   Tue Jun 5 00:46:55 2012 +0200

    update patch for logging nb #156876

 freemarker-2.3.19~logging.patch |   22 ++++++++++++++++++++++
 freemarker.spec                 |    7 +++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/freemarker-2.3.19~logging.patch b/freemarker-2.3.19~logging.patch
new file mode 100644
index 0000000..3bcde1e
--- /dev/null
+++ b/freemarker-2.3.19~logging.patch
@@ -0,0 +1,22 @@
+--- src/freemarker/log/Logger.java	2012-03-01 01:56:24.000000000 +0100
++++ src/freemarker/log/Logger.java-gil	2012-06-05 00:38:36.004769500 +0200
+@@ -301,12 +301,18 @@
+             	
+                 try
+                 {
+-                    return createFactory(i);
++                    LoggerFactory f = createFactory(i);
++                    f.getLogger("just.testing");
++                    return f;
+                 }
+                 catch(ClassNotFoundException e)
+                 {
+                     ;//Intentionally ignored
+                 }
++                catch(NoClassDefFoundError e)
++                {
++                    ;//Intentionally ignored
++                }
+             }
+             System.err.println("*** WARNING: FreeMarker logging suppressed.");
+             return new NullLoggerFactory();
diff --git a/freemarker.spec b/freemarker.spec
index a9e9dc1..8aba9b5 100644
--- a/freemarker.spec
+++ b/freemarker.spec
@@ -9,7 +9,7 @@ echo "ERROR: Sources should not contain JAR files:" && echo "$F" && exit 1
 
 Name:           freemarker
 Version:        %{fm_ver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A template engine
 
 Group:          Development/Libraries
@@ -23,7 +23,7 @@ Patch0:         %{name}-%{version}-build.patch
 #
 Patch1:         %{name}-2.3.13~PyObject.__class__.patch
 # http://netbeans.org/bugzilla/show_bug.cgi?id=156876
-Patch2:         %{name}-%{version}-logging.patch
+Patch2:         %{name}-%{version}~logging.patch
 # illegal character in the javadoc comment
 Patch3:         %{name}-2.3.13~encoding.patch
 # do not depend on tomcat5
@@ -177,6 +177,9 @@ dos2unix -k docs/docs/api/package-list
 %doc LICENSE.txt
 
 %changelog
+* Tue Jun 05 2012 gil cattaneo <puntogil at libero.it - 2.3.19-2
+- update patch for logging
+
 * Thu May 31 2012 Omair Majid <omajid at redhat.com> - 2.3.19-1
 - Add dependency on apache-commons-logging
 


More information about the scm-commits mailing list