remove 3.2 from package name

tomcat/rc.tomcat

@@ -1,15 +1,15 @@
 #!@l_prefix@/lib/rpm/bash @l_prefix@/etc/rc
 ##
-##  rc.tomcat3.2 -- Run-Commands for Tomcat 3.2
+##  rc.tomcat -- Run-Commands for Tomcat
 ##
 
 %env
-    TOMCAT_HOME="@l_prefix@/libexec/tomcat3.2"
+    TOMCAT_HOME="@l_prefix@/libexec/tomcat"
     export TOMCAT_HOME
 
 %start -u root
-    @l_prefix@/libexec/tomcat3.2/bin/tomcat.sh start
+    @l_prefix@/libexec/tomcat/bin/tomcat.sh start
 
 %stop -u root
-    @l_prefix@/libexec/tomcat3.2/bin/tomcat.sh stop
+    @l_prefix@/libexec/tomcat/bin/tomcat.sh stop
 

tomcat/tomcat.patch

@@ -4,17 +4,17 @@
      -->
      <Logger name="tc_log" 
              verbosityLevel = "INFORMATION" 
-+            path="/cw/var/tomcat3.2/log/tomcat.log"
++            path="/cw/var/tomcat/log/tomcat.log"
      />
  
      <Logger name="servlet_log" 
 -            path="logs/servlet.log"
-+            path="/cw/var/tomcat3.2/log/servlet.log"
++            path="/cw/var/tomcat/log/servlet.log"
      />
  
      <Logger name="JASPER_LOG" 
 -	    path="logs/jasper.log"
-+	    path="/cw/var/tomcat3.2/log/jasper.log"
++	    path="/cw/var/tomcat/log/jasper.log"
              verbosityLevel = "INFORMATION" />
  
      <!-- You can add a "home" attribute to represent the "base" for 

tomcat/tomcat.spec

@@ -1,5 +1,5 @@
 ##
-##  tomcat3.2.spec -- OpenPKG RPM Specification
+##  tomcat.spec -- OpenPKG RPM Specification
 ##  Copyright (c) 2000-2001 Cable & Wireless Deutschland GmbH
 ##  Copyright (c) 2000-2001 Ralf S. Engelschall <rse@engelschall.com>
 ##
@@ -23,7 +23,7 @@
 ##  
 
 #   package information
-Name:         tomcat3.2
+Name:         tomcat
 Summary:      Apache Jakarta Tomcat
 URL:          http://jakarta.apache.org/
 Vendor:       Apache Software Foundation
@@ -32,11 +32,11 @@ Distribution: OpenPKG [EXP]
 Group:        Web
 License:      Apache Software License 1.1
 Version:      3.2.4
-Release:      20011220
+Release:      20011222
 
 #   list of sources
 Source0:      http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
-Source1:      rc.tomcat3.2
+Source1:      rc.tomcat
 
 #   build information
 Prefix:       %{l_prefix}
@@ -62,29 +62,29 @@ AutoReqProv:  no
     #   create installation tree
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
-        $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat3.2 \
-        $RPM_BUILD_ROOT%{l_prefix}/share/tomcat3.2/doc \
-        $RPM_BUILD_ROOT%{l_prefix}/var/tomcat3.2/log
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat \
+        $RPM_BUILD_ROOT%{l_prefix}/share/tomcat/doc \
+        $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/log
 
     #   unpack vendor distribution and relocate to final location
     %{l_prefix}/bin/tar -cf - --exclude lib/test \
         bin/*.sh bin/ant bin/antRun conf lib src webapps \
-        | ( umask 022; cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat3.2/; \
+        | ( umask 022; cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/; \
         %{l_prefix}/bin/tar -xf - )
 
     #   patch vendor distribution
-    (   cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat3.2
+    (   cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat
         %{l_rpmtool} subst 's;@l_prefix@;%{l_prefix};g' \
-            -- %{SOURCE tomcat3.2.patch}
-        %{l_prefix}/bin/patch -p0 < %{SOURCE tomcat3.2.patch}
+            -- %{SOURCE tomcat.patch}
+        %{l_prefix}/bin/patch -p0 < %{SOURCE tomcat.patch}
     )
 
     #   make scripts executable
-    chmod 755 $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat3.2/bin/*
+    chmod 755 $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/bin/*
 
     #   install run-command script
     %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
-        %{SOURCE rc.tomcat3.2} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+        %{SOURCE rc.tomcat} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}