- switch from "sendmail "to "MTA" dependency - removed incorrect petidomo dependency - switched to use of "rpmtool config" - fix typo in install procedure

jitterbug/jitterbug.spec

@@ -41,8 +41,8 @@ Source1:      config.tar
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 0.9-20011025.0, sendmail, zlib
-PreReq:       OpenPKG, openpkg >= 0.9-20011025.0, sendmail, apache, petidomo, gzip
+BuildPreReq:  OpenPKG, openpkg >= 0.9-20011025.0, zlib
+PreReq:       OpenPKG, openpkg >= 0.9-20011025.0, MTA, apache, gzip
 AutoReq:      no
 AutoReqProv:  no
 
@@ -85,8 +85,10 @@ AutoReqProv:  no
           's;@l_npgid@;%{l_npgid};g' \
           -- `find . -type f -print`
       rm -rf */*.orig */.[a-z]*.orig >/dev/null 2>&1 || true
-      %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/jitterbug
-      %{l_shtool} mkdir -f -p -m 755 %$RPM_BUILD_ROOT%{l_prefix}/var/jitterbug/bugdb
+      %{l_shtool} mkdir -f -p -m 755 \
+          $RPM_BUILD_ROOT%{l_prefix}/etc/jitterbug
+      %{l_shtool} mkdir -f -p -m 755 \
+          $RPM_BUILD_ROOT%{l_prefix}/var/jitterbug/bugdb
       %{l_shtool} install -c -m - etc/* \
           $RPM_BUILD_ROOT%{l_prefix}/etc/jitterbug/
       cp -rp var/* var/.[a-z]* \
@@ -103,59 +105,49 @@ AutoReqProv:  no
 
 %post 
     if [ ".$1" = .1 ]; then
-        #   add hook into Sendmail configuration
-        if [ -f $RPM_INSTALL_PREFIX/etc/sendmail/t.aliases ]; then
-            check=`grep '^#<OpenPKG pkg=jitterbug>' $RPM_INSTALL_PREFIX/etc/sendmail/t.aliases`
-            if [ ".$check" = . ]; then
-                ( echo "#<OpenPKG pkg=jitterbug>"
-                  echo "bugdb: \"|$RPM_INSTALL_PREFIX/bin/jitterbug-mail bugdb-guest\""
-                  echo "owner-bugdb: root"
-                  echo "#</OpenPKG>"
-                ) >>$RPM_INSTALL_PREFIX/etc/sendmail/t.aliases
-                (cd $RPM_INSTALL_PREFIX/etc/sendmail/; make t.aliases.db)
+        #   add hook into MTA configuration
+        aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_file`
+        update_command=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_update`
+        if [ ".$aliases_file" != . ]; then
+            ( echo "bugdb: \"|$RPM_INSTALL_PREFIX/bin/jitterbug-mail bugdb-guest\""
+              echo "owner-bugdb: postmaster"
+            ) |\
+            $RPM_INSTALL_PREFIX/sbin/rpmtool config \
+                -a -i "$RPM_INSTALL_PREFIX:jitterbug" $aliases_file
+            if [ ".$update_command" != . ]; then
+                eval $update_command
             fi
         fi
         #   add hook into Apache configuration
-        if [ -f $RPM_INSTALL_PREFIX/etc/apache/apache.conf ]; then
-            check=`grep '^#<OpenPKG pkg=jitterbug>' $RPM_INSTALL_PREFIX/etc/apache/apache.conf`
-            if [ ".$check" = . ]; then
-                ( echo "#<OpenPKG pkg=jitterbug>"
-                  echo "Alias /bugdb $RPM_INSTALL_PREFIX/var/jitterbug/bugdb"
-                  echo "<Directory $RPM_INSTALL_PREFIX/var/jitterbug/bugdb>"
-                  echo "    AllowOverride all"
-                  echo "</Directory>"
-                  echo "#</OpenPKG>"
-                ) >>$RPM_INSTALL_PREFIX/etc/apache/apache.conf
-            fi
+        apacheconf="$RPM_INSTALL_PREFIX/etc/apache/apache.conf"
+        if [ -f $apacheconf ]; then
+            ( echo "Alias /bugdb $RPM_INSTALL_PREFIX/var/jitterbug/bugdb"
+              echo "<Directory $RPM_INSTALL_PREFIX/var/jitterbug/bugdb>"
+              echo "    AllowOverride all"
+              echo "</Directory>"
+            ) |\
+            $RPM_INSTALL_PREFIX/sbin/rpmtool config \
+                -a -i "$RPM_INSTALL_PREFIX:jitterbug" $apacheconf
         fi
     fi  
 
 %postun 
     if [ ".$1" = .0 ]; then
-        #   remove hook from Sendmail configuration
-        if [ -f $RPM_INSTALL_PREFIX/etc/sendmail/t.aliases ]; then
-            check=`grep '^#<OpenPKG pkg=jitterbug>' $RPM_INSTALL_PREFIX/etc/sendmail/t.aliases`
-            if [ ".$check" != . ]; then
-                cp -p $RPM_INSTALL_PREFIX/etc/sendmail/t.aliases \
-                      $RPM_INSTALL_PREFIX/etc/sendmail/t.aliases.orig 
-                sed -e '/^#<OpenPKG pkg=jitterbug>/,/^#<\/OpenPKG>/d' \
-                    <$RPM_INSTALL_PREFIX/etc/sendmail/t.aliases.orig \
-                    >$RPM_INSTALL_PREFIX/etc/sendmail/t.aliases
-                (cd $RPM_INSTALL_PREFIX/etc/sendmail/; make t.aliases.db)
-                rm -f $RPM_INSTALL_PREFIX/etc/sendmail/t.aliases.orig
+        #   remove hook from MTA configuration
+        aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_file`
+        update_command=`$RPM_INSTALL_PREFIX/etc/rc --query mta_aliases_update`
+        if [ ".$aliases_file" != . ]; then
+            $RPM_INSTALL_PREFIX/sbin/rpmtool config \
+                -r -i "$RPM_INSTALL_PREFIX:jitterbug" $aliases_file
+            if [ ".$update_command" != . ]; then
+                eval $update_command
             fi
         fi
         #   remove hook from Apache configuration
-        if [ -f $RPM_INSTALL_PREFIX/etc/apache/apache.conf ]; then
-            check=`grep '^#<OpenPKG pkg=jitterbug>' $RPM_INSTALL_PREFIX/etc/apache/apache.conf`
-            if [ ".$check" != . ]; then
-                cp -p $RPM_INSTALL_PREFIX/etc/apache/apache.conf \
-                      $RPM_INSTALL_PREFIX/etc/apache/apache.conf.orig 
-                sed -e '/^#<OpenPKG pkg=jitterbug>/,/^#<\/OpenPKG>/d' \
-                    <$RPM_INSTALL_PREFIX/etc/apache/apache.conf.orig \
-                    >$RPM_INSTALL_PREFIX/etc/apache/apache.conf
-                rm -f $RPM_INSTALL_PREFIX/etc/apache/apache.conf.orig
-            fi
+        apacheconf="$RPM_INSTALL_PREFIX/etc/apache/apache.conf"
+        if [ -f $apacheconf ]; then
+            $RPM_INSTALL_PREFIX/sbin/rpmtool config \
+                -r -i "$RPM_INSTALL_PREFIX:jitterbug" $apacheconf
         fi
     fi