OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   16-Dec-2002 20:57:55
  Branch: HEAD                             Handle: 2002121619575500

  Modified files:
    openpkg-src/tomcat4     tomcat4.spec

  Log:
    spec-file police: use usual style ;-)

  Summary:
    Revision    Changes     Path
    1.3         +8  -9      openpkg-src/tomcat4/tomcat4.spec
  ____________________________________________________________________________

  Index: openpkg-src/tomcat4/tomcat4.spec
  ============================================================
  $ cvs diff -u -r1.2 -r1.3 tomcat4.spec
  --- openpkg-src/tomcat4/tomcat4.spec  16 Dec 2002 17:36:17 -0000      1.2
  +++ openpkg-src/tomcat4/tomcat4.spec  16 Dec 2002 19:57:55 -0000      1.3
  @@ -57,7 +57,6 @@
   
   %build
       
  -
   %install
       rm -rf $RPM_BUILD_ROOT
   
  @@ -73,15 +72,15 @@
       #   unpack vendor distribution and relocate to final location
       %{l_tar} -cf - \
           bin/*.sh bin/*.jar common conf server shared webapps |\
  -    (   umask 022; \
  -        cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/; \
  -        %{l_tar} -xf - )
  +    ( umask 022
  +      cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/
  +      %{l_tar} -xf - )
   
       #   move ${jkHome}/conf to var
       mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/conf
  +       $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/conf
   
  -    #   provide symlink for ${jkHome}/work and {$jkHome}/conf
  +    #   provide symlink for ${jkHome}/work and ${jkHome}/conf
       ln -s \
           %{l_prefix}/var/tomcat/work \
           $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/work
  @@ -123,10 +122,10 @@
   
   %preun
       if [ $1 -eq 0 ]; then
  -        # remove log files
  -        rm -f $RPM_INSTALL_PREFIX/var/tomcat/log/*
  +        #   remove log files
  +        rm -f  $RPM_INSTALL_PREFIX/var/tomcat/log/*
           rm -rf $RPM_INSTALL_PREFIX/var/tomcat/temp/*
           rm -rf $RPM_INSTALL_PREFIX/var/tomcat/work/*
  -        rm -f $RPM_INSTALL_PREFIX/var/tomcat/conf/jk2.properties.save
  +        rm -f  $RPM_INSTALL_PREFIX/var/tomcat/conf/jk2.properties.save
       fi
   
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to