rpms/jakarta-commons-net/devel jakarta-commons-net.spec,1.3,1.4

Permaine Cheung (pcheung) fedora-extras-commits at redhat.com
Wed Jan 23 16:00:52 UTC 2008


Author: pcheung

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

Modified Files:
	jakarta-commons-net.spec 
Log Message:
Fixed if condition



Index: jakarta-commons-net.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-net/devel/jakarta-commons-net.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jakarta-commons-net.spec	22 Jan 2008 18:46:57 -0000	1.3
+++ jakarta-commons-net.spec	23 Jan 2008 16:00:13 -0000	1.4
@@ -63,7 +63,6 @@
 Patch0:         %{name}-crosslink.patch
 Patch1:         %{short_name}-%{version}-project_xml.patch
 Patch2:         %{short_name}-%{version}-project_properties.patch
-Patch3:         %{short_name}-%{version}-disable-tests.patch
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
 %if ! %{without_tests}
@@ -140,7 +139,6 @@
 %patch0 -b .sav
 %patch1 -b .sav
 %patch2 -b .sav
-#%patch3 -b .sav
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -178,14 +176,14 @@
 ln -s %{_javadir}/junit.jar target/lib
 
 export CLASSPATH=%{_javadir}/oro.jar:%{_javadir}/junit.jar
-%if %{without_tests}
-ant -Dnoget=true -Dfinal.name=commons-net-%{version} \
-  -Dj2se.api=%{_javadocdir}/java jar javadoc
-%else
+%if ! %{without_tests}
 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
 




More information about the fedora-extras-commits mailing list