From ba0c415d4a84d8849a8eba11ce8dabe68ffd196c Mon Sep 17 00:00:00 2001
From: daidai_is_here <daiqianwen@huawei.com>
Date: Tue, 21 Jan 2020 10:45:07 +0800
Subject: [PATCH] modify spec

---
 0003-Fix-encoding.patch | 41 -----------------------------------------
 avalon-logkit.spec      | 11 ++++++++---
 2 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 0003-Fix-encoding.patch

diff --git a/0003-Fix-encoding.patch b/0003-Fix-encoding.patch
deleted file mode 100644
index 52c11c5..0000000
--- a/0003-Fix-encoding.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8fd096a56d52beb49e37db17254b57bb3aef860f Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Tue, 14 Jun 2016 13:53:27 +0200
-Subject: [PATCH 3/3] Fix encoding
-
----
- src/java/org/apache/log/ContextMap.java | 4 ++--
- src/java/org/apache/log/Logger.java     | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/java/org/apache/log/ContextMap.java b/src/java/org/apache/log/ContextMap.java
-index 046106b..2305955 100644
---- a/src/java/org/apache/log/ContextMap.java
-+++ b/src/java/org/apache/log/ContextMap.java
-@@ -29,8 +29,8 @@ import java.util.Hashtable;
-  * <li>hostname  -&gt;helm.realityforge.org</li>
-  * <li>ipaddress -&gt;1.2.3.4</li>
-  * <li>interface -&gt;127.0.0.1</li>
-- * <li>caller � �-&gt;com.biz.MyCaller.method(MyCaller.java:18)</li>
-- * <li>source � �-&gt;1.6.3.2:33</li>
-+ * <li>caller    -&gt;com.biz.MyCaller.method(MyCaller.java:18)</li>
-+ * <li>source    -&gt;1.6.3.2:33</li>
-  * </ul>
-  * The context is bound to a thread (and inherited by sub-threads) but
-  * it can also be added to by LogTargets.
-diff --git a/src/java/org/apache/log/Logger.java b/src/java/org/apache/log/Logger.java
-index 43ce1b7..d1f7efd 100644
---- a/src/java/org/apache/log/Logger.java
-+++ b/src/java/org/apache/log/Logger.java
-@@ -295,7 +295,7 @@ public class Logger
-     }
- 
-     /**
--     * Determine if messages of priority �will be logged.
-+     * Determine if messages of priority will be logged.
-      * @param priority the priority
-      * @return true if messages will be logged
-      */
--- 
-2.5.5
-
diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index 7ba67e8..545530e 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -1,7 +1,7 @@
 Name:           avalon-logkit
 Epoch:          0
 Version:        2.1
-Release:        31
+Release:        32
 Summary:        Java logging toolkit
 License:        ASL 2.0
 URL:            http://avalon.apache.org/
@@ -10,7 +10,6 @@ Source0:        http://archive.apache.org/dist/excalibur/%{name}/source/%{name}-
 
 Patch0001:      0001-Port-build-script-to-Maven-3.patch
 Patch0002:      0002-Port-to-Java-7.patch
-Patch0003:      0003-Fix-encoding.patch
 
 BuildRequires:  maven-local mvn(javax.mail:mail) mvn(javax.servlet:servlet-api)
 BuildRequires:  mvn(junit:junit) mvn(log4j:log4j) mvn(org.apache.felix:maven-bundle-plugin)
@@ -68,7 +67,13 @@ find . -type d -name lf5 | xargs rm -rf
 %files help -f .mfiles-javadoc
 
 %changelog
-* Thu Dec 12 2019 lijin Yang <yanglijin@huawei.com> - 1.1-3
+* Tue Jan 21 2020 daiqianwen <daiqianwen@huawei.com> - 0:2.1-32
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: modify spec
+
+* Thu Dec 12 2019 lijin Yang <yanglijin@huawei.com> - 0:2.1-31
 - init package
 
 * Tue May 07 2019 zhangyujing <zhangyujing1@huawei.com> - 0:2.1-30.h1