[freemarker] Remove obsolete patches
Omair Majid
omajid at fedoraproject.org
Wed Jun 27 20:58:56 UTC 2012
commit f458f5b3a842bc3a499a0cfeaf782bf2abf34709
Author: Omair Majid <omajid at redhat.com>
Date: Wed Jun 27 16:57:33 2012 -0400
Remove obsolete patches
freemarker-2.3.13-pom.xml | 28 --
freemarker-2.3.13~build.patch | 991 ---------------------------------------
freemarker-2.3.13~logging.patch | 23 -
freemarker-2.3.19-logging.patch | 13 +-
freemarker-2.3.19~logging.patch | 22 -
freemarker.spec | 5 +-
6 files changed, 15 insertions(+), 1067 deletions(-)
---
diff --git a/freemarker-2.3.19-logging.patch b/freemarker-2.3.19-logging.patch
index fca0dbe..3bcde1e 100644
--- a/freemarker-2.3.19-logging.patch
+++ b/freemarker-2.3.19-logging.patch
@@ -1,6 +1,6 @@
--- src/freemarker/log/Logger.java 2012-03-01 01:56:24.000000000 +0100
-+++ src/freemarker/log/Logger.java-gil 2012-05-16 13:16:58.400510103 +0200
-@@ -301,7 +301,9 @@
++++ src/freemarker/log/Logger.java-gil 2012-06-05 00:38:36.004769500 +0200
+@@ -301,12 +301,18 @@
try
{
@@ -11,3 +11,12 @@
}
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 8aba9b5..a760c34 100644
--- a/freemarker.spec
+++ b/freemarker.spec
@@ -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
+* Wed Jun 27 2012 Omair Majid <omajid at redhat.com> - 2.3.19-2
+- Remove obsolete patches
+
* Tue Jun 05 2012 gil cattaneo <puntogil at libero.it - 2.3.19-2
- update patch for logging
More information about the scm-commits
mailing list