rpms/jakarta-commons-codec/devel jakarta-commons-codec.spec, 1.14, 1.15

[fedora-cvs-commits at redhat.com]

Author: mwringe

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

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



Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jakarta-commons-codec.spec	26 Sep 2006 14:17:14 -0000	1.14
+++ jakarta-commons-codec.spec	26 Sep 2006 19:34:04 -0000	1.15
@@ -38,7 +38,7 @@
 
 Name:           jakarta-commons-codec
 Version:        1.3
-Release:        6jpp.1
+Release:        7jpp.1
 Summary:        Jakarta Commons Codec Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -50,6 +50,7 @@
 BuildRequires:  ant >= 0:1.6.2
 BuildRequires:  ant-junit
 BuildRequires:  junit
+BuildRequires:  java-javadoc
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
@@ -70,6 +71,7 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires:       java-javadoc
 Requires(post): /bin/rm /bin/ln
 Requires(postun): /bin/rm
 
@@ -171,6 +173,12 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Sep 26 2006 Matt Wringe <mwringe at redhat.com> 0:1.3-7jpp.1
+- Merge with upstream version.
+
+* Tue Sep 26 2006 Matt Wringe <mwringe at redhat.com> 0:1.3-7jpp
+- Add missing java-javadoc requires and buildrequires.
+
 * Mon Sep 25 2006 Matt Wringe <mwringe at redhat.com> 0:1.3-6jpp.1
 - Merge with upstream version.