- updated to 1.2.6

- removed obsolete junit3.8 patch (no tests included in this version),
  added unreachable patch with fix for "unreachable statement" compilation error

Changed files:
    jakarta-log4j-junit3.8.patch -> 1.2
    jakarta-log4j-unreachable.patch -> 1.1
    java-log4j.spec -> 1.11

diff --git a/jakarta-log4j-junit3.8.patch b/jakarta-log4j-junit3.8.patch
deleted file mode 100644 (file)
index b187397..0000000
--- a/jakarta-log4j-junit3.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- jakarta-log4j-1.1.3/src/java/org/apache/log4j/test/UnitTestCategory.java.orig      Tue Jun 19 19:22:44 2001
-+++ jakarta-log4j-1.1.3/src/java/org/apache/log4j/test/UnitTestCategory.java   Sat Aug 31 10:20:29 2002
-@@ -103,7 +103,7 @@
-     Enumeration enum = cat.getAllAppenders();\r
-     Appender aHat = (Appender) enum.nextElement();    \r
-     assertEquals(a2, aHat);\r
--    assert(!enum.hasMoreElements());\r
-+    assertTrue(!enum.hasMoreElements());\r
-   }\r
- \r
-   /**\r

diff --git a/jakarta-log4j-unreachable.patch b/jakarta-log4j-unreachable.patch
new file mode 100644 (file)
index 0000000..e69880b
--- /dev/null
+++ b/jakarta-log4j-unreachable.patch
@@ -0,0 +1,11 @@
+--- jakarta-log4j-1.2.6/src/java/org/apache/log4j/net/JMSAppender.java.orig    Thu Aug  1 18:34:19 2002
++++ jakarta-log4j-1.2.6/src/java/org/apache/log4j/net/JMSAppender.java Wed Sep  4 21:04:47 2002
+@@ -329,7 +329,7 @@
+   }\r
+ \r
+   String getURLPkgPrefixes( ) {\r
+-    return urlPkgPrefixes;;\r
++    return urlPkgPrefixes;\r
+   }\r
+ \r
+   public void setURLPkgPrefixes(String urlPkgPrefixes ) {\r

diff --git a/java-log4j.spec b/java-log4j.spec
index d57e2e9e77b7b90e159c2c93cd30ddbdcf6b4688..64e1e8a3ea7fba8e805571920bd81562523af23a 100644 (file)
--- a/java-log4j.spec
+++ b/java-log4j.spec
@@ -1,12 +1,12 @@
 Summary:       log4j - logging for Java
 Summary(pl):   log4j - zapis logów dla Javy
 Name:          jakarta-log4j
-Version:       1.1.3
-Release:       3
+Version:       1.2.6
+Release:       1
 License:       Apache
 Group:         Development/Languages/Java
 Source0:       http://jakarta.apache.org/builds/%{name}/release/v%{version}/%{name}-%{version}.tar.gz
-Patch0:                %{name}-junit3.8.patch
+Patch0:                %{name}-unreachable.patch
 URL:           http://jakarta.apache.org/
 BuildRequires: jakarta-ant
 BuildRequires: javamail >= 1.2
@@ -57,8 +57,7 @@ CLASSPATH="$CLASSPATH:%{_javalibdir}/junit.jar"
 CLASSPATH="$CLASSPATH:%{_javalibdir}/classes/xerces.jar"
 export JAVA_HOME CLASSPATH
 
-sh build.sh jar
-sh build.sh javadoc
+ant jar javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE.APL
+%doc LICENSE.txt
 %{_javalibdir}/*.jar
 
 %files doc