rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Author: dbhole

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

Modified Files:
	jakarta-commons-daemon.spec 
Log Message:

- Added missing requirements
- Fixed bug that cause post/postun to not run when built with --with native




Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jakarta-commons-daemon.spec	10 Aug 2006 10:37:56 -0000	1.12
+++ jakarta-commons-daemon.spec	18 Aug 2006 18:21:47 -0000	1.13
@@ -40,7 +40,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0.1
-Release:        4jpp_3fc
+Release:        6jpp.1
 Epoch:          1
 Summary:        Jakarta Commons Daemon Package
 License:        Apache Software License 2.0
@@ -93,7 +93,8 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires(post):		coreutils
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}.
@@ -132,10 +133,11 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 %endif
 
-
+%if ! %{native}
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -145,8 +147,12 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%postun javadoc
+if [ $1 -eq 0 ]; then
+  %{__rm} -f %{_javadocdir}/%{name}
+fi
 
-%if %{native}
+%if ! %{native}
 %post
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -162,7 +168,9 @@
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
+%endif
 
+%if %{native}
 %files jsvc
 %defattr(-,root,root,-)
 %doc LICENSE*
@@ -176,7 +184,7 @@
 %{_javadir}/*
 
 %if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-daemon-1.0.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %files javadoc
@@ -187,12 +195,13 @@
 %endif
 
 %changelog
+* Thu Aug 17 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0.1-6jpp.1
+- Added missing requirements
+- Fixed bug that cause post/postun to not run when built with --with native
+
 * Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 1.0.1-4jpp_3fc
 - Requires(post):     coreutils
 
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:1.0.1-4jpp_2fc
-- Rebuilt
-
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0.1-4jpp_1fc
 - Remove name/release/version defines as applicable.