rpms/avalon-framework/devel avalon-framework-target.patch, 1.1, 1.2 avalon-framework.spec, 1.22, 1.23

[fedora-cvs-commits at redhat.com]

Author: pcheung

Update of /cvs/dist/rpms/avalon-framework/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv764

Modified Files:
	avalon-framework-target.patch avalon-framework.spec 
Log Message:
Fix the building of javadoc



avalon-framework-target.patch:
 build.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: avalon-framework-target.patch
===================================================================
RCS file: /cvs/dist/rpms/avalon-framework/devel/avalon-framework-target.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-framework-target.patch	15 Dec 2005 10:41:50 -0000	1.1
+++ avalon-framework-target.patch	5 Apr 2007 04:19:31 -0000	1.2
@@ -10,3 +10,11 @@
              <classpath refid="project.class.path" />
              <src path="${test.dir}"/>
              <exclude name="org/apache/avalon/framework/logger/LogKit*.java"
+@@ -329,6 +330,7 @@ Legal:
+         <mkdir dir="${target.javadocs}"/>
+ 
+         <javadoc packagenames="org.apache.*"
++            source="1.4"
+             sourcepath="${java.dir}"
+             destdir="${target.javadocs}">
+             <classpath refid="project.class.path" />


Index: avalon-framework.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-framework/devel/avalon-framework.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- avalon-framework.spec	16 Mar 2007 16:02:55 -0000	1.22
+++ avalon-framework.spec	5 Apr 2007 04:19:31 -0000	1.23
@@ -116,6 +116,8 @@
 # create unversioned symlinks
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
@@ -155,6 +157,7 @@
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
 
 %changelog
 * Thu Mar 08 2007 Permaine Cheung <pcheung at redhat.com> - 0:4.1.4-2jpp.14