rpms/ant/devel ant.spec,1.87,1.88

[Permaine Cheung (pcheung)]

Author: pcheung

Update of /cvs/pkgs/rpms/ant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1018

Modified Files:
	ant.spec 
Log Message:
Enable building commons-net subpackage




Index: ant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ant/devel/ant.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ant.spec	27 Jul 2007 18:53:37 -0000	1.87
+++ ant.spec	16 Aug 2007 13:28:37 -0000	1.88
@@ -243,8 +243,6 @@
 Taches commons logging optionelles pour %{name}.
 %endif
 
-# Disable because we don't ship the dependencies
-%if 0
 %if ! %{bootstrap1} && ! %{bootstrap2}
 %package commons-net
 Summary:        Optional commons net tasks for %{name}
@@ -268,6 +266,8 @@
 Taches commons net optionelles pour %{name}.
 %endif
 
+# Disable because we don't ship the dependencies
+%if 0
 %package jai
 Summary:        Optional jai tasks for %{name}
 Group:          Development/Build Tools
@@ -665,7 +665,7 @@
 cp -p build/lib/%{name}-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
 cp -p build/lib/%{name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
 cp -p build/lib/%{name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
-#cp -p build/lib/%{name}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
+cp -p build/lib/%{name}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
 #cp -p build/lib/%{name}-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jai-%{version}.jar
 cp -p build/lib/%{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
 cp -p build/lib/%{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
@@ -718,7 +718,7 @@
 echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr
 echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf
 echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging
-#echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
+echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
 #echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jai
 echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel
 echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j
@@ -770,8 +770,6 @@
 fi
 %endif
 
-# We do not ship dependencies for these, so they are disabled.
-%if 0
 %if %{gcj_support}
 %post commons-net
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -788,6 +786,8 @@
 fi
 %endif
 
+# We do not ship dependencies for these, so they are disabled.
+%if 0
 %if %{gcj_support}
 %post jai
 if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -1162,8 +1162,6 @@
 %endif
 %endif
 
-# Disable as we dont ship the dependencies
-%if 0
 %if ! %{bootstrap1} && ! %{bootstrap2}
 %files commons-net
 %defattr(0644,root,root,0755)
@@ -1177,6 +1175,8 @@
 %endif
 %endif
 
+# Disable as we dont ship the dependencies
+%if 0
 %files jai
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jai.jar
@@ -1365,6 +1365,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Aug 14 2007 Permaine Cheung <pcheung at redhat.com> - 0:1.7.0-1jpp.2
+- Enable building commons-net subpackage
+
 * Fri Jul 27 2007 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-1jpp.1
 - Merge with upstream for upgrade