rpms/jakarta-commons-pool/devel jakarta-commons-pool.spec, 1.17, 1.18

[fedora-cvs-commits at redhat.com]

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-pool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27998

Modified Files:
	jakarta-commons-pool.spec 
Log Message:
Merge with upstream version.



Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-commons-pool.spec	26 Sep 2006 14:23:38 -0000	1.17
+++ jakarta-commons-pool.spec	26 Sep 2006 19:34:44 -0000	1.18
@@ -45,7 +45,7 @@
 
 Name:		jakarta-commons-pool
 Version:	1.3
-Release:	4jpp.1
+Release:	5jpp.1
 Epoch:		0
 Summary:	Jakarta Commons Pool Package
 License:	Apache Software License 2.0
@@ -63,6 +63,7 @@
 BuildRequires:	ant
 BuildRequires:	junit
 BuildRequires:  jpackage-utils > 0:1.6
+BuildRequires:  java-javadoc
 %if %{with_maven}
 BuildRequires:  maven >= 0:1.1
 BuildRequires:  saxon
@@ -91,6 +92,7 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Requires:	java-javadoc
 Requires(post):   /bin/rm,/bin/ln
 Requires(postun): /bin/rm
 
@@ -219,6 +221,12 @@
 %endif
 
 %changelog
+* Tue Sep 26 2006 Matt Wringe <mwringe at redhat.com> 1:1.3-5jpp.1
+- Merge with upstream version.
+
+* Tue Sep 26 2006 Matt Wringe <mwringe at redhat.com> 1:1.3-5jpp
+- Add missing java-javadoc required and buildrequires.
+
 * Mon Sep 25 2006 Matt Wringe <mwringe at redhat.com> 1:1.3-4jpp.1
 - Merge with upstream version