rpms/log4j/devel log4j.spec, 1.11, 1.12 log4j-bz133180.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: ashah

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

Modified Files:
	log4j.spec 
Removed Files:
	log4j-bz133180.patch 
Log Message:
Reenable building of example that uses rmic



Index: log4j.spec
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/log4j.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- log4j.spec	22 Jun 2005 09:35:37 -0000	1.11
+++ log4j.spec	3 Nov 2005 01:14:21 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           log4j
 Version:        1.2.8
-Release:        7jpp_5fc
+Release:        7jpp_6fc
 Epoch:          0
 Summary:        Java logging package
 License:        Apache Software License
@@ -19,8 +19,7 @@
 Source7:        %{name}.catalog
 Patch0:         %{name}-logfactor5-userdir.patch
 Patch1:         %{name}-javadoc-xlink.patch
-Patch2:         %{name}-bz133180.patch
-Patch3:         %{name}-bz157585.patch
+Patch2:         %{name}-bz157585.patch
 BuildRequires:  ant, jaf >= 0:1.0.1-5jpp, javamail >= 0:1.2-5jpp
 BuildRequires:  jms
 BuildRequires:  jndi, jpackage-utils >= 0:1.5, xml-commons-apis-javadoc
@@ -52,8 +51,7 @@
 %setup -q -n jakarta-%{name}-%{version}
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
-%patch3 -p1
+%patch2 -p1
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.class" -exec rm -f {} \;
@@ -163,6 +161,9 @@
 
 
 %changelog
+* Thu Nov  3 2005 Archit Shah <ashah at redhat.com> 0:1.2.8-7jpp_6fc
+- Reenable building of example that uses rmic
+
 * Wed Jun 22 2005 Gary Benson <gbenson at redhat.com> 0:1.2.8-7jpp_5fc
 - Reenable building of classes that require jms.
 - Remove classes and jarfiles from the tarball.


--- log4j-bz133180.patch DELETED ---