Add some rpm-related intelligence to flea.

diff --git a/muttbug.sh.in b/muttbug.sh.in
index 063cc539479c767145952bc465906013ec9792a6..71bf32366fff8b958e082182d6884e7085d335ed 100644 (file)
--- a/muttbug.sh.in
+++ b/muttbug.sh.in
@@ -183,6 +183,12 @@ else
        DPKG=no
 fi
 
+if rpm -q mutt > /dev/null ; then
+       echo "Mutt seems to come from an RPM package."
+       RPMVERSION="`rpm -q mutt`"
+       RPMPACKAGER="`rpm -q -i mutt | sed -n -e 's/^Packager *:/Packager:/p'`"
+fi
+
 MUTTVERSION="`mutt -v | head -1 | awk '{print $2}'`"
 test "$DPKG" = "yes" && SUBMIT="$SUBMIT, $DEBIAN_SUBMIT"
 
@@ -197,7 +203,7 @@ echo "To: $SUBMIT"
 echo "Bcc: ${EMAIL-$LOGNAME}"
 echo
 echo "Package: mutt"
-echo "Version: ${DEBIANVERSION-$MUTTVERSION}"
+echo "Version: ${DEBIANVERSION-${RPMVERSION-MUTTVERSION}}"
 echo "Severity: $severity"
 echo 
 echo "-- Please type your report below this line"
@@ -210,6 +216,13 @@ if test "$DEBIAN" = "yes" ; then
        bug -p -s dummy mutt < /dev/null |                     \
                sed -n -e "/^-- System Information/,/^---/p" | \
                grep -v '^---'
+else
+       echo "-- System Information"
+       echo "System Version: `uname -a`"
+       test -z "$RPMPACKAGER" || echo "RPM Packager: $RPMPACKAGER";
+       test -f /etc/redhat_release && echo "RedHat Release: `cat /etc/redhat_release`"
+       test -f /etc/SuSE-release && echo "SuSE Release: `head-1 /etc/SuSE-release`"
+       # Please provide more of these if you have any.
 fi
 
 echo