rpms/log4j/devel log4j-bz157585.patch,1.1,1.2 log4j.spec,1.19,1.20

[fedora-cvs-commits at redhat.com]

Author: vivekl

Update of /cvs/dist/rpms/log4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2035

Modified Files:
	log4j-bz157585.patch log4j.spec 
Log Message:
- Resync with latest from JPP.
- Update patch for BZ #157585 to apply cleanly.
- Partially adopt new naming convention.



log4j-bz157585.patch:
 DetailPanel.java |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: log4j-bz157585.patch
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/log4j-bz157585.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j-bz157585.patch	23 May 2005 17:24:21 -0000	1.1
+++ log4j-bz157585.patch	8 Aug 2006 20:44:09 -0000	1.2
@@ -1,11 +1,11 @@
---- jakarta-log4j-1.2.8/src/java/org/apache/log4j/chainsaw/DetailPanel.java~	2003-02-20 01:07:36.000000000 +0000
-+++ jakarta-log4j-1.2.8/src/java/org/apache/log4j/chainsaw/DetailPanel.java	2005-05-23 17:50:36.000000000 +0100
-@@ -34,7 +34,7 @@
- 
-     /** used to format the logging event **/
-     private static final MessageFormat FORMATTER = new MessageFormat(
--        "<b>Time:</b> <code>{0,time,medium}</code>" +
-+        "<b>Time:</b> <code>{0,time}</code>" +
-         "  <b>Priority:</b> <code>{1}</code>" +
-         "  <b>Thread:</b> <code>{2}</code>" +
-         "  <b>NDC:</b> <code>{3}</code>" +
+--- ./src/java/org/apache/log4j/chainsaw/DetailPanel.java.orig	2005-12-04 22:00:58.000000000 -0500
++++ ./src/java/org/apache/log4j/chainsaw/DetailPanel.java	2006-08-08 16:20:46.000000000 -0400
+@@ -43,7 +43,7 @@
+ 
+     /** used to format the logging event **/
+     private static final MessageFormat FORMATTER = new MessageFormat(
+-        "<b>Time:</b> <code>{0,time,medium}</code>" +
++        "<b>Time:</b> <code>{0,time}</code>" +
+         "  <b>Priority:</b> <code>{1}</code>" +
+         "  <b>Thread:</b> <code>{2}</code>" +
+         "  <b>NDC:</b> <code>{3}</code>" +


Index: log4j.spec
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/log4j.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- log4j.spec	22 Jul 2006 08:44:34 -0000	1.19
+++ log4j.spec	8 Aug 2006 20:44:09 -0000	1.20
@@ -36,7 +36,7 @@
 
 Name:           log4j
 Version:        1.2.13
-Release:        2jpp_2fc
+Release:        3jpp.1
 Epoch:          0
 Summary:        Java logging package
 License:        Apache Software License
@@ -54,6 +54,7 @@
 Source7:        %{name}.catalog
 Patch0:         %{name}-logfactor5-userdir.patch
 Patch1:         %{name}-javadoc-xlink.patch
+#FIXME: Is this patch required?
 Patch2:         %{name}-bz157585.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant
@@ -97,16 +98,19 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          System/Logging
+Requires(post):		%{__rm}
+Requires(post):		/bin/ln
+Requires(postun):	%{__rm}
 
 %description    javadoc
 Javadoc for %{name}.
 
-
 %prep
 %setup -q -n logging-%{name}-%{version}
 %patch0 -b .sav
 %patch1 -b .sav
-#%patch2 -p1
+# FIXME: Is this patch still required?
+%patch2 -p1
 
 %{__perl} -pi -e 's/\r//g' LICENSE.txt
 
@@ -267,6 +271,11 @@
 
 
 %changelog
+* Tue Aug 08 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.2.13-3jpp.1
+- Re-sync with latest from JPP.
+- Update patch for BZ #157585 to apply cleanly.
+- Partially adopt new naming convention.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.13-2jpp_2fc
 - Rebuilt