Attachment 150581 Details for Bug 233290 – spec file patch

[patch] spec file patch

ant.spec.patch (text/plain), 3.21 KB, created by Anthony Green on 2007-03-21 14:20:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anthony Green

Created: 2007-03-21 14:20:25 UTC

Size: 3.21 KB

patch

obsolete

>--- ant.spec~	2007-03-21 06:42:12.000000000 -0700
>+++ ant.spec	2007-03-21 06:53:20.000000000 -0700
>@@ -633,7 +633,7 @@
> %build
> # classpath selects optional components to build
> #export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jai/jai_codec jai/jai_core jsch bsf xml-commons-resolver)
>-export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging jsch bsf xml-commons-resolver)
>+export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jsch bsf xml-commons-resolver)
> 
> # perform bootstrap and build without jjp or user configs,
> # (except JAVA_HOME as required by build script)
>@@ -672,7 +672,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
>@@ -732,7 +732,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
>@@ -1184,8 +1184,6 @@
> %endif
> %endif
> 
>-# Disable as we dont ship the dependencies
>-%if 0
> %if ! %{bootstrap1} && ! %{bootstrap2}
> %files commons-net
> %defattr(0644,root,root,0755)
>@@ -1199,6 +1197,8 @@
> %endif
> %endif
> 
>+# Disable as we dont ship the dependencies
>+%if 0
> %files jai
> %defattr(0644,root,root,0755)
> %{_javadir}/%{name}/%{name}-jai.jar
>@@ -1386,6 +1386,9 @@
> # -----------------------------------------------------------------------------
> 
> %changelog
>+* Wed Mar 21 2007 Anthony Green <green@redhat.com> 1.6.5-4jpp.3
>+- Enable commons-net package since we ship the dependency now.
>+
> * Mon Mar 19 2007 Permaine Cheung <pcheung@redhat.com> 1.6.5-4jpp.2
> - Get rid of the Provides for ant-optional and ant-optional-full.
>

Actions: View | Diff

Attachments on bug 233290: 150581