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

[fedora-cvs-commits at redhat.com]

Author: mwringe

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

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



Index: jakarta-commons-launcher.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-launcher/devel/jakarta-commons-launcher.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jakarta-commons-launcher.spec	10 Aug 2006 10:32:08 -0000	1.14
+++ jakarta-commons-launcher.spec	10 Aug 2006 18:39:46 -0000	1.15
@@ -39,7 +39,7 @@
 
 Name:           %{name}
 Version:        0.9
-Release:        5jpp_3fc
+Release:        6jpp.1
 Epoch:          0
 Summary:        The Launcher Component is designed to be a cross platform Java application launcher.
 License:        Apache Software License
@@ -74,7 +74,8 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Requires(post):		coreutils
+Requires(post): /bin/rm /bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -121,6 +122,10 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ "$1" = "0" ]; then
+   rm -f %{_javadocdir}/%{name}
+fi
 
 %post
 %if %{gcj_support}
@@ -154,6 +159,11 @@
 
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:0.9-6jpp.1
+- Merge with upstream version
+- Add missing javadoc postun
+- Add missing javadoc requires
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 0.9-5jpp_3fc
 - Requires(post):     coreutils