- Resync with latest from JPP.

- Partially adopt new naming convention.

velocity.spec

@@ -37,7 +37,7 @@
 
 Name:           velocity
 Version:        1.4
-Release:        5jpp_2fc
+Release:        6jpp.1
 Epoch:          0
 Summary:        Java-based template engine
 License:        Apache Software License
@@ -116,6 +116,9 @@ Documentation for %{name}.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):		%{__rm}
+Requires(post):		/bin/ln
+Requires(postun):	%{__rm}
 
 %description    javadoc
 Javadoc for %{name}.
@@ -250,10 +253,6 @@ fi
 
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/velocity-1.4.jar.*
-#FIXME: This was not generated by spec-convert-gcj-* script
-#but natively compiled by aot-compile-rpm. There doesnt seem
-#to be a jar in the buildroot for classloader, yet it is
-#compiled by aot-compile-rpm! Find out why.
 %attr(-,root,root) %{_libdir}/gcj/%{name}/classloader.*
 %endif
 
@@ -284,6 +283,10 @@ fi
 #%endif
 
 %changelog
+* Tue Aug 08 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-6jpp.1
+- Resync with latest from JPP.
+- Partially adopt new naming convention.
+
 * Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-5jpp_2fc
 - Rebuilt