comments inline
On Mon, Jun 29, 2009 at 3:54 PM, Partha Aji<[email protected]> wrote:
> java/spacewalk-java.spec | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> New commits:
> commit f221ed3961b8e98dc2ec1089e0cb1e07837c8cc1
> Author: Partha Aji <[email protected]>
> Date: Mon Jun 29 15:57:40 2009 -0400
>
> 508736 - Corrected spec to properly set the cobbler/snippets/spacewalk
> symlink
>
> diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
> index 4a19631..22e3f09 100644
> --- a/java/spacewalk-java.spec
> +++ b/java/spacewalk-java.spec
> @@ -3,6 +3,7 @@
> %define cobprofdirup %{_localstatedir}/lib/rhn/kickstarts/upload
> %define cobprofdirwiz %{_localstatedir}/lib/rhn/kickstarts/wizard
> %define cobdirsnippets %{_localstatedir}/lib/rhn/kickstarts/snippets
> +%define realcobsnippetsdir %{_localstatedir}/lib/cobbler/snippets
> %define appdir %{_localstatedir}/lib/tomcat5/webapps
> %define jardir %{_localstatedir}/lib/tomcat5/webapps/rhn/WEB-INF/lib
> %define jars antlr asm bcel c3p0 cglib commons-beanutils commons-cli
> commons-codec commons-digester commons-discovery commons-el commons-io
> commons-fileupload commons-lang commons-logging commons-validator concurrent
> dom4j hibernate3 jaf jasper5-compiler jasper5-runtime javamail jcommon jdom
> jfreechart jspapi jpam log4j redstone-xmlrpc redstone-xmlrpc-client ojdbc14
> oro oscache sitemesh struts taglibs-core taglibs-standard xalan-j2 xerces-j2
> xml-commons-apis commons-collections
> @@ -202,16 +203,14 @@ install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar
> $RPM_BUILD_ROOT/%{_datad
> install -m 644 conf/log4j.properties.taskomatic
> $RPM_BUILD_ROOT/%{_datadir}/rhn/classes/log4j.properties
> ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd
> ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar
> -
> +mkdir -p $RPM_BUILD_ROOT/%{realcobsnippetsdir}
follow the paradigm of using install -d -m 755
$RPM_BUILD_ROOT/%{realcobsnippetsdir}
> +ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk
>
> %clean
> rm -rf $RPM_BUILD_ROOT
>
> -%postun
> -rm -f /var/lib/cobbler/snippets/spacewalk
> -
> -%post
> -ln -s -f %{cobdirsnippets} /var/lib/cobbler/snippets/spacewalk
> +%pre
> +rm -f %{realcobsnippetsdir}/spacewalk
>
> %post -n spacewalk-taskomatic
> # This adds the proper /etc/rc*.d links for the script
> @@ -232,6 +231,7 @@ fi
> %dir %{cobdirsnippets}
> %{appdir}/*
> %config(noreplace) %{_sysconfdir}/tomcat5/Catalina/localhost/rhn.xml
> +%{realcobsnippetsdir}/spacewalk
>
> %files -n spacewalk-taskomatic
> %attr(755, root, root) %{_initrddir}/taskomatic
> @@ -497,6 +497,7 @@ fi
> code had been ripped out, so i converted it to java ([email protected])
> - 491361 - Added note to error messages to check the log for error messages.
> ([email protected])
> - 500891 - fixed an unescaped string on snippets delete confirm page
> ([email protected])
> +dually.rdu.redhat.com,10.11.228.46 ssh-rsa
> AAAAB3NzaC1yc2EAAAABIwAAAQEAt3L3QI0h+nKNrRIrd/Qj/l2aaPAtSk1O7smalVJZYLx8JCwmYLd+XzWc9b951l6zevxMIHfHRFjA2EwoJWKVzffNE/91RVs9jQ3M5289YX5VZbu6g/9PZ6gj5JG7EN+Q6h29iDhJ/LBrZb62ytXru+jBGMcoBoZggQ+nAtjZstZcOwlIOZ0ldLMJycsWV2aKXwhbVgowtE/evPuF+lF68Z4Fdfi/ScznuF7mQlHAnxQNEQCQojjqf37fgW8dQENIxoaFOJXOFjeW57X2HIgz0XX3ux3kgtGgmKvQanVRpISnUBnlEEXtDvYxO73mlTen+eS+wbyhF0Wkpg3OEWaTOQ==
what is this doing here?
jesus
_______________________________________________
Spacewalk-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/spacewalk-devel
