rpms/jakarta-commons-net/devel commons-net-1.4.1-project_properties.patch, 1.1, 1.2 commons-net-1.4.1-project_xml.patch, 1.1, 1.2 jakarta-commons-net-crosslink.patch, 1.1, 1.2 jakarta-commons-net.spec, 1.4, 1.5

[Permaine Cheung (pcheung)]

Author: pcheung

Update of /cvs/extras/rpms/jakarta-commons-net/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14456

Modified Files:
	commons-net-1.4.1-project_properties.patch 
	commons-net-1.4.1-project_xml.patch 
	jakarta-commons-net-crosslink.patch jakarta-commons-net.spec 
Log Message:
Fix patches and spec file



commons-net-1.4.1-project_properties.patch:

Index: commons-net-1.4.1-project_properties.patch
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-net/devel/commons-net-1.4.1-project_properties.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commons-net-1.4.1-project_properties.patch	8 Mar 2007 21:51:14 -0000	1.1
+++ commons-net-1.4.1-project_properties.patch	23 Jan 2008 17:48:32 -0000	1.2
@@ -5,7 +5,7 @@
  
  # commons site L&F
 -maven.xdoc.jsl=../commons-build/commons-site.jsl
-+maven.xdoc.jsl=commons-build/commons-site.jsl
++maven.xdoc.jsl=file://${basedir}/commons-build/commons-site.jsl
  maven.xdoc.date=left
  maven.xdoc.version=${pom.currentVersion}
  maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html

commons-net-1.4.1-project_xml.patch:

Index: commons-net-1.4.1-project_xml.patch
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-net/devel/commons-net-1.4.1-project_xml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commons-net-1.4.1-project_xml.patch	8 Mar 2007 21:51:14 -0000	1.1
+++ commons-net-1.4.1-project_xml.patch	23 Jan 2008 17:48:32 -0000	1.2
@@ -18,8 +18,8 @@
 @@ -211,12 +213,16 @@
  	<reports>
  		<report>maven-changes-plugin</report>
- 		<report>maven-tasklist-plugin</report>
 +<!--
+ 		<report>maven-tasklist-plugin</report>
  		<report>maven-statcvs-plugin</report>
 +-->
  		<report>maven-junit-report-plugin</report>

jakarta-commons-net-crosslink.patch:

Index: jakarta-commons-net-crosslink.patch
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-net/devel/jakarta-commons-net-crosslink.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-commons-net-crosslink.patch	8 Mar 2007 21:51:14 -0000	1.1
+++ jakarta-commons-net-crosslink.patch	23 Jan 2008 17:48:32 -0000	1.2
@@ -1,15 +1,24 @@
---- build.xml.orig	2005-12-03 17:05:48.000000000 +0100
-+++ build.xml	2006-05-08 19:41:56.000000000 +0200
-@@ -20,6 +20,8 @@
-   </property>
-   <property name="final.name" value="commons-net-1.4.1">
-   </property>
-+  <property name="final.name" value="commons-net-1.4.1">
-+  </property>
-   <path id="build.classpath">
-     <fileset dir="${libdir}">
-       <include name="**/*.jar">
-@@ -152,6 +154,7 @@
+--- build.xml.sav	2005-12-03 17:05:48.000000000 +0100
++++ build.xml	2007-02-11 20:46:58.000000000 +0100
+@@ -58,7 +58,7 @@
+       </fileset>
+     </copy>
+   </target>
+-  <target name="jar" description="o Create the jar" depends="compile,test">
++  <target name="jar" description="o Create the jar" depends="compile">
+     <jar jarfile="${defaulttargetdir}/${final.name}.jar">
+ 	    <fileset dir="${classesdir}">
+ 		    <exclude name="**/examples/**"/>
+@@ -71,7 +71,7 @@
+     <delete dir="${distdir}">
+     </delete>
+   </target>
+-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
++  <target name="dist" description="o Create a distribution" depends="jar, test, javadoc">
+     <mkdir dir="dist">
+     </mkdir>
+     <copy todir="dist">
+@@ -152,6 +152,7 @@
          <path refid="build.classpath">
          </path>
        </classpath>


Index: jakarta-commons-net.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-net/devel/jakarta-commons-net.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jakarta-commons-net.spec	23 Jan 2008 16:00:13 -0000	1.4
+++ jakarta-commons-net.spec	23 Jan 2008 17:48:32 -0000	1.5
@@ -176,14 +176,14 @@
 ln -s %{_javadir}/junit.jar target/lib
 
 export CLASSPATH=%{_javadir}/oro.jar:%{_javadir}/junit.jar
-%if ! %{without_tests}
+%if %{without_tests}
+ant -Dnoget=true -Dfinal.name=commons-net-%{version} \
+  -Dj2se.api=%{_javadocdir}/java jar javadoc
+%else
 export OPT_JAR_LIST="ant/ant-junit junit"
 # FIXME: Investigate test failures in Fedora
 ant -Dnoget=true -Dfinal.name=commons-net-%{version} \
   -Dj2se.api=%{_javadocdir}/java jar test javadoc
-%else
-ant -Dnoget=true -Dfinal.name=commons-net-%{version} \
-  -Dj2se.api=%{_javadocdir}/java jar javadoc
 %endif
 %endif