rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec, 1.33, 1.34

[fedora-cvs-commits at redhat.com]

Author: mwringe

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

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
- Merge with upstream version:
 - Add missing requires for javadoc



Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jakarta-commons-digester.spec	10 Aug 2006 10:16:06 -0000	1.33
+++ jakarta-commons-digester.spec	10 Aug 2006 19:45:31 -0000	1.34
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.7
-Release:        4jpp_3fc
+Release:        5jpp.1
 Epoch:          0
 Summary:        Jakarta Commons Digester Package
 License:        Apache Software License
@@ -72,8 +72,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):		coreutils
-Requires(postun):	coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -106,6 +106,7 @@
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -152,8 +153,13 @@
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:1.7-5jpp.1
+- Merge with upstream version:
+ - Add missing requires for javadoc
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.7-4jpp_3fc
 - Requires(post/postun): coreutils