Hello community, here is the log from the commit of package log4j for openSUSE:Factory checked in at Fri Dec 11 14:09:54 CET 2009. -------- --- log4j/log4j.changes 2008-07-16 12:53:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/log4j/log4j.changes 2009-12-10 12:15:18.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Dec 10 11:11:47 UTC 2009 - mvyskocil@suse.cz + +- refreshed patches + * log4j-javadoc-xlink.patch + * log4j-jmx-Agent.patch + * log4j-logfactor5-userdir.patch + * log4j-mx4j-tools.patch + +------------------------------------------------------------------- --- log4j/log4j-mini.changes 2008-05-06 12:36:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/log4j/log4j-mini.changes 2009-12-10 12:15:16.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Dec 10 11:11:47 UTC 2009 - mvyskocil@suse.cz + +- refreshed patches + * log4j-javadoc-xlink.patch + * log4j-jmx-Agent.patch + * log4j-logfactor5-userdir.patch + * log4j-mx4j-tools.patch + +------------------------------------------------------------------- +Wed Jul 16 12:52:50 CEST 2008 - coolo@suse.de + +- even more packages to build ignore + +------------------------------------------------------------------- +Fri Jun 27 10:54:27 CEST 2008 - coolo@suse.de + +- avoid build cycle between axis and log4j + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4j-mini.spec ++++++ --- /var/tmp/diff_new_pack.Kv0HIh/_old 2009-12-11 14:08:35.000000000 +0100 +++ /var/tmp/diff_new_pack.Kv0HIh/_new 2009-12-11 14:08:35.000000000 +0100 @@ -26,9 +26,9 @@ # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/jpackage-mini-prepare.sh %{_sourcedir} %{name}) Version: 1.2.15 -Release: 75 +Release: 76 Summary: Java logging tool (internal featureless package breaking dependency loop) -License: The Apache Software License +License: ASLv.. Url: http://logging.apache.org/log4j/ Source0: http://www.apache.org/dist/logging/log4j/%{version}/apache-log4j-%{version}.tar.bz2 #Source0: logging-log4j-1.2.13-RHCLEAN.tar.gz @@ -89,7 +89,7 @@ %if ! %{bootstrap} %package manual -License: The Apache Software License +License: ASLv.. Summary: Java logging tool (internal featureless package breaking dependency loop) Group: Development/Libraries/Java @@ -100,7 +100,7 @@ %package javadoc -License: The Apache Software License +License: ASLv.. PreReq: coreutils Summary: Java logging tool (Documentation) Group: Development/Libraries/Java ++++++ log4j.spec ++++++ --- /var/tmp/diff_new_pack.Kv0HIh/_old 2009-12-11 14:08:35.000000000 +0100 +++ /var/tmp/diff_new_pack.Kv0HIh/_new 2009-12-11 14:08:35.000000000 +0100 @@ -25,9 +25,9 @@ # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/jpackage-mini-prepare.sh %{_sourcedir} %{name}) Version: 1.2.15 -Release: 103 +Release: 104 Summary: Java logging tool -License: The Apache Software License +License: ASLv.. Url: http://logging.apache.org/log4j/ Source0: http://www.apache.org/dist/logging/log4j/%{version}/apache-log4j-%{version}.tar.bz2 #Source0: logging-log4j-1.2.13-RHCLEAN.tar.gz @@ -90,7 +90,7 @@ %if ! %{bootstrap} %package manual -License: The Apache Software License +License: ASLv.. Summary: Java logging tool (Manual) Group: Development/Libraries/Java @@ -100,7 +100,7 @@ %package javadoc -License: The Apache Software License +License: ASLv.. PreReq: coreutils Summary: Java logging tool (Documentation) Group: Development/Libraries/Java ++++++ log4j-javadoc-xlink.patch ++++++ --- /var/tmp/diff_new_pack.Kv0HIh/_old 2009-12-11 14:08:35.000000000 +0100 +++ /var/tmp/diff_new_pack.Kv0HIh/_new 2009-12-11 14:08:35.000000000 +0100 @@ -1,8 +1,10 @@ ---- build.xml.sav 2006-04-03 19:34:39.000000000 +0200 -+++ build.xml 2006-04-03 19:35:22.000000000 +0200 -@@ -434,8 +434,7 @@ - header="<b>Log4j ${version}</b>" - bottom="Copyright 2000-2005 Apache Software Foundation."> +Index: build.xml +=================================================================== +--- build.xml.orig 2009-12-10 12:10:48.324389951 +0100 ++++ build.xml 2009-12-10 12:11:02.125266268 +0100 +@@ -517,8 +517,7 @@ + -->' + bottom="Copyright 2000-2007 Apache Software Foundation."> - <link href="http://java.sun.com/j2se/1.3/docs/api/"/> - <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/> ++++++ log4j-jmx-Agent.patch ++++++ --- /var/tmp/diff_new_pack.Kv0HIh/_old 2009-12-11 14:08:35.000000000 +0100 +++ /var/tmp/diff_new_pack.Kv0HIh/_new 2009-12-11 14:08:35.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/main/java/org/apache/log4j/jmx/Agent.java.sav 2006-09-14 09:04:18.000000000 +0200 -+++ src/main/java/org/apache/log4j/jmx/Agent.java 2007-04-18 15:40:59.000000000 +0200 -@@ -19,7 +19,7 @@ +Index: src/main/java/org/apache/log4j/jmx/Agent.java +=================================================================== +--- src/main/java/org/apache/log4j/jmx/Agent.java.orig 2009-12-10 12:10:46.918388360 +0100 ++++ src/main/java/org/apache/log4j/jmx/Agent.java 2009-12-10 12:11:14.701264560 +0100 +@@ -20,7 +20,7 @@ import javax.management.ObjectName; import javax.management.MBeanServer; import javax.management.MBeanServerFactory; @@ -9,7 +11,7 @@ import org.apache.log4j.Logger; -@@ -36,7 +36,7 @@ +@@ -37,7 +37,7 @@ void start() { MBeanServer server = MBeanServerFactory.createMBeanServer(); @@ -18,7 +20,7 @@ try { log.info("Registering HtmlAdaptorServer instance."); -@@ -46,9 +46,14 @@ +@@ -47,9 +47,14 @@ server.registerMBean(hdm, new ObjectName("log4j:hiearchy=default")); } catch(Exception e) { ++++++ log4j-logfactor5-userdir.patch ++++++ --- /var/tmp/diff_new_pack.Kv0HIh/_old 2009-12-11 14:08:35.000000000 +0100 +++ /var/tmp/diff_new_pack.Kv0HIh/_new 2009-12-11 14:08:35.000000000 +0100 @@ -1,5 +1,7 @@ ---- src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java.sav 2006-04-03 19:30:42.000000000 +0200 -+++ src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java 2006-04-03 19:31:35.000000000 +0200 +Index: src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java +=================================================================== +--- src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java.orig 2009-12-10 12:10:48.754263787 +0100 ++++ src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java 2009-12-10 12:10:53.073264414 +0100 @@ -340,7 +340,7 @@ String home = System.getProperty("user.home"); String sep = System.getProperty("file.separator"); @@ -9,9 +11,11 @@ } //-------------------------------------------------------------------------- ---- src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java.sav 2006-04-03 19:32:18.000000000 +0200 -+++ src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java 2006-04-03 19:32:40.000000000 +0200 -@@ -166,14 +166,14 @@ +Index: src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java +=================================================================== +--- src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java.orig 2009-12-10 12:10:48.755263943 +0100 ++++ src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java 2009-12-10 12:10:53.074264009 +0100 +@@ -167,14 +167,14 @@ /** * Creates the directory where the MRU file list will be written. @@ -28,7 +32,7 @@ if (!f.exists()) { try { f.mkdir(); -@@ -259,7 +259,7 @@ +@@ -260,7 +260,7 @@ String home = System.getProperty("user.home"); String sep = System.getProperty("file.separator"); @@ -37,7 +41,7 @@ } /** -@@ -281,4 +281,4 @@ +@@ -282,4 +282,4 @@ //-------------------------------------------------------------------------- // Nested Top-Level Classes or Interfaces //-------------------------------------------------------------------------- ++++++ log4j-mx4j-tools.patch ++++++ --- /var/tmp/diff_new_pack.Kv0HIh/_old 2009-12-11 14:08:35.000000000 +0100 +++ /var/tmp/diff_new_pack.Kv0HIh/_new 2009-12-11 14:08:35.000000000 +0100 @@ -1,6 +1,8 @@ ---- build.xml.sav2 2007-04-18 15:15:09.000000000 +0200 -+++ build.xml 2007-04-18 15:15:38.000000000 +0200 -@@ -139,7 +139,7 @@ +Index: build.xml +=================================================================== +--- build.xml.orig 2009-12-10 12:11:02.125266268 +0100 ++++ build.xml 2009-12-10 12:11:08.119263459 +0100 +@@ -166,7 +166,7 @@ <and> <available classname="javax.management.MBeanInfo" classpath="${jmx.jar}"/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org