[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jpackage-announce
Subject:    [JPackage-announce] [RPM (1.6)] log4j-1.2.9-1jpp
From:       jpackage () zarb ! org (Ville =?ISO-8859-1?Q?Skytt=C3=A4?=)
Date:       2005-04-26 22:51:24
Message-ID: 20050426205119.0BA5560A5ED () ryu ! zarb ! org
[Download RAW message or body]

Name        : log4j                        Relocations: (not relocatable)
Version     : 1.2.9                             Vendor: JPackage Project
Release     : 1jpp                          Build Date: Tue 26 Apr 2005 10:48:07 PM \
CEST Install Date: (not installed)               Build Host: bobcat.mine.nu
Group       : System/Logging                Source RPM: (none)
Size        : 2787456      License: Apache Software License
Signature   : (none)
Packager    : Ville Skytt?? <scop@jpackage.org>
URL         : http://logging.apache.org/log4j/
Summary     : Java logging package
Description :
Log4j is a tool to help the programmer output log statements to a
variety of output targets.

---------------
Ville Skytt?? <scop at jpackage.org> - 0:1.2.9-1jpp
- 1.2.9.
- Fix URLs.
- Crosslink with local JDK javadocs.
---------------

---------------
Index: log4j-javadoc-xlink.patch
===================================================================
RCS file: /var/lib/cvs/jpackage/rpms/free/log4j/log4j-javadoc-xlink.patch,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 log4j-javadoc-xlink.patch
--- log4j-javadoc-xlink.patch	31 Aug 2003 12:01:12 -0000	1.1.2.1
+++ log4j-javadoc-xlink.patch	26 Apr 2005 20:51:18 -0000
@@ -1,14 +1,12 @@
---- build.xml~	2003-02-20 03:07:31.000000000 +0200
-+++ build.xml	2003-08-31 03:41:21.000000000 +0300
-@@ -383,8 +383,11 @@
-            header="&lt;b&gt;Log4j ${version}&lt;/b&gt;"
- 	   bottom="Copyright 2000-2002 Apache Software Foundation.">
- 
-+      <link href="/usr/share/javadoc/xml-commons-apis"/>
-+      <!--
-       <link href="http://java.sun.com/products/jdk/1.3/docs/api"/>
-       <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
-+      -->
-       <classpath refid="compile.classpath"/>
-     </javadoc>
-   </target>
+--- build.xml.orig	2005-04-26 23:40:38.000000000 +0300
++++ build.xml	2005-04-26 23:43:48.000000000 +0300
+@@ -385,8 +385,7 @@
+            header="&lt;b&gt;Log4j ${version}&lt;/b&gt;"
+ 	   bottom="Copyright 2000-2002 Apache Software Foundation.">
+ 
+-      <link href="http://java.sun.com/products/jdk/1.3/docs/api"/>
+-      <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
++      <link href="${jdk.javadoc}"/>
+       <classpath refid="compile.classpath"/>
+     </javadoc>
+   </target>
Index: log4j-logfactor5-userdir.patch
===================================================================
RCS file: /var/lib/cvs/jpackage/rpms/free/log4j/log4j-logfactor5-userdir.patch,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 log4j-logfactor5-userdir.patch
--- log4j-logfactor5-userdir.patch	31 Aug 2003 12:01:12 -0000	1.1.2.1
+++ log4j-logfactor5-userdir.patch	26 Apr 2005 20:51:18 -0000
@@ -1,53 +1,24 @@
-diff -Naru jakarta-log4j-1.2.8.orig/docs/lf5/configuration.html \
                jakarta-log4j-1.2.8/docs/lf5/configuration.html
---- jakarta-log4j-1.2.8.orig/docs/lf5/configuration.html	2003-02-20 \
                03:07:31.000000000 +0200
-+++ jakarta-log4j-1.2.8/docs/lf5/configuration.html	2003-08-31 03:22:21.000000000 \
                +0300
-@@ -120,7 +120,7 @@
- 	Configure-&gt;Save menu option saves your current GUI
- 	configuration to a file called
- 	<b>lf5_configuration.xml</b>. This configuration file is a
+diff -NrU0 logging-log4j-1.2.9.orig/docs/lf5/configuration.html \
logging-log4j-1.2.9/docs/lf5/configuration.html +--- \
logging-log4j-1.2.9.orig/docs/lf5/configuration.html	2004-11-01 22:21:15.000000000 \
+0200 ++++ logging-log4j-1.2.9/docs/lf5/configuration.html	2005-04-26 \
23:32:05.000000000 +0300 +@@ -126 +126 @@
 -	saved to the location &lt;USER_HOME&gt;/lf5 on your local
 +	saved to the location &lt;USER_HOME&gt;/.logfactor5 on your local
- 	drive.
-       </p>
-                                                 <p>The information saved in the \
                configuration file is as
-diff -Naru jakarta-log4j-1.2.8.orig/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java \
jakarta-log4j-1.2.8/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java
                
---- jakarta-log4j-1.2.8.orig/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java	2003-02-20 \
                03:07:41.000000000 +0200
-+++ jakarta-log4j-1.2.8/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java	2003-08-31 \
                03:21:27.000000000 +0300
-@@ -332,7 +332,7 @@
-     String home = System.getProperty("user.home");
-     String sep = System.getProperty("file.separator");
- 
--    return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
-+    return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME;
-   }
- 
-   //--------------------------------------------------------------------------
-diff -Naru jakarta-log4j-1.2.8.orig/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java \
jakarta-log4j-1.2.8/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java
                
---- jakarta-log4j-1.2.8.orig/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java	2003-02-20 \
                03:07:38.000000000 +0200
-+++ jakarta-log4j-1.2.8/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java	2003-08-31 \
                03:22:23.000000000 +0300
-@@ -158,14 +158,14 @@
- 
-   /**
-    * Creates the directory where the MRU file list will be written.
--   * The "lf5" directory is created in the Documents and Settings
-+   * The ".logfactor5" directory is created in the Documents and Settings
-    * directory on Windows 2000 machines and where ever the user.home
-    * variable points on all other platforms.
-    */
-   public static void createConfigurationDirectory() {
-     String home = System.getProperty("user.home");
-     String sep = System.getProperty("file.separator");
--    File f = new File(home + sep + "lf5");
-+    File f = new File(home + sep + ".logfactor5");
-     if (!f.exists()) {
-       try {
-         f.mkdir();
-@@ -251,7 +251,7 @@
-     String home = System.getProperty("user.home");
-     String sep = System.getProperty("file.separator");
- 
--    return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
-+    return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME;
-   }
- 
-   /**
+diff -NrU0 logging-log4j-1.2.9.orig/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java \
logging-log4j-1.2.9/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java
 +--- logging-log4j-1.2.9.orig/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java	2004-11-01 \
22:21:14.000000000 +0200 ++++ \
logging-log4j-1.2.9/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java	2005-04-26 \
23:32:05.000000000 +0300 +@@ -335 +335 @@
+-    return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
++    return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME;
+diff -NrU0 logging-log4j-1.2.9.orig/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java \
logging-log4j-1.2.9/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java
 +--- logging-log4j-1.2.9.orig/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java	2004-11-01 \
22:21:14.000000000 +0200 ++++ \
logging-log4j-1.2.9/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java	2005-04-26 \
23:32:05.000000000 +0300 +@@ -161 +161 @@
+-   * The "lf5" directory is created in the Documents and Settings
++   * The ".logfactor5" directory is created in the Documents and Settings
+@@ -168 +168 @@
+-    File f = new File(home + sep + "lf5");
++    File f = new File(home + sep + ".logfactor5");
+@@ -254 +254 @@
+-    return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
++    return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME;
Index: log4j.spec
===================================================================
RCS file: /var/lib/cvs/jpackage/rpms/free/log4j/log4j.spec,v
retrieving revision 1.5.2.4.2.1
diff -u -r1.5.2.4.2.1 log4j.spec
--- log4j.spec	22 Feb 2005 22:04:39 -0000	1.5.2.4.2.1
+++ log4j.spec	26 Apr 2005 20:51:18 -0000
@@ -1,13 +1,13 @@
 %define section	free
 
 Name:           log4j
-Version:        1.2.8
-Release:        9jpp
+Version:        1.2.9
+Release:        1jpp
 Epoch:          0
 Summary:        Java logging package
 License:        Apache Software License
-URL:            http://jakarta.apache.org/log4j/
-Source0:        http://jakarta.apache.org/log4j/jakarta-log4j-1.2.8.tar.gz
+URL:            http://logging.apache.org/log4j/
+Source0:        http://www.apache.org/dist/logging/log4j/1.2.9/logging-log4j-1.2.9.tar.gz
  # Converted from src/java/org/apache/log4j/lf5/viewer/images/lf5_small_icon.gif
 Source1:        %{name}-logfactor5.png
 Source2:        %{name}-logfactor5.sh
@@ -26,7 +26,7 @@
 BuildRequires:  jms
 BuildRequires:  jmx
 BuildRequires:  jndi
-BuildRequires:  xml-commons-apis-javadoc
+BuildRequires:  java-javadoc
 Requires:       jpackage-utils >= 0:1.5
 Requires:       xml-commons-apis
 Requires:       jaxp_parser_impl
@@ -55,7 +55,7 @@
 Javadoc for %{name}.
 
 %prep
-%setup -q -n jakarta-%{name}-%{version}
+%setup -q -n logging-%{name}-%{version}
 %patch0 -p1
 %patch1 -p0
 # remove all binary libs
@@ -63,7 +63,7 @@
 
 %build
 export CLASSPATH=$(build-classpath jaf javamail/mailapi jms jmxri jmxtools)
-%ant jar javadoc
+%ant -Djdk.javadoc=%{_javadocdir}/java jar javadoc
 
 %install
 %__rm -rf %{buildroot}
@@ -169,6 +169,11 @@
 
 
 %changelog
+* Tue Apr 26 2005 Ville Skytt?? <scop at jpackage.org> - 0:1.2.9-1jpp
+- 1.2.9.
+- Fix URLs.
+- Crosslink with local JDK javadocs.
+
 * Tue Feb 22 2005 David Walluck <david@jpackage.org> 0:1.2.8-9jpp
 - own non-versioned javadoc symlink
 - fix perl location in contribs script
@@ -176,7 +181,7 @@
 * Sat Aug 21 2004 Fernando Nasser <fnasser@redhat.com> - 0:1.2.8-8jpp
 - Rebuild wit Ant 1.6.2
 
-* Sun Aug 31 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.2.8-7jpp
+* Sun Aug 31 2003 Ville Skytt?? <scop at jpackage.org> - 0:1.2.8-7jpp
 - Add scripts and freedesktop.org menu entries for LogFactor5 and Chainsaw.
 - Include log4j.dtd and install SGML/XML catalogs.
 - Require jpackage-utils, jaxp_parser_impl.


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic