--- doc/loncapafiles/rpmcheck.piml	2004/05/24 18:08:26	1.3
+++ doc/loncapafiles/rpmcheck.piml	2004/08/23 19:07:26	1.8
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: rpmcheck.piml,v 1.3 2004/05/24 18:08:26 matthew Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.8 2004/08/23 19:07:26 matthew Exp $ -->
 
 <!--
 
@@ -35,11 +35,18 @@ http://www.lon-capa.org/
 <file>
 <target dist="default">/home/httpd/lonUsers</target>
 <perlscript mode="fg">
+my $rhversion = "7.3";
+if (-e '/etc/redhat-release') {
+    my $tmp = `cat /etc/redhat-release`;
+    if ($tmp =~ /fedora/i) {
+        $rhversion = 'fedora';
+    }
+}
 #
 # Look for php packages that should not be installed
 my @phprpms = `rpm -q -a|grep php`;
 if (@phprpms) {
-    print "WARNING: PHP packages are present on this system.\n".
+    print "**** WARNING: PHP packages are present on this system.\n".
         "There are known conflicts between PHP libraries and LON-CAPA.\n".
         "Use the following command to remove ".
         "the php packages from your system:\nrpm -e ";
@@ -54,14 +61,14 @@ if (@phprpms) {
 my @mod_rpms = `rpm -q -a | grep mod`;
 foreach my $rpm (@mod_rpms) {
     if ($rpm =~ /mod_bandwidth/) {
-        print "WARNING: it appears you have the mod_bandwidth ".
+        print "**** WARNING: it appears you have the mod_bandwidth ".
         "package installed.\n".
         "mod_bandwidth appears to conflict with LON-CAPA.\n".
         "Use the following command to remove it:\n".
         "rpm -e $rpm\n";
     }
     if ($rpm =~ /mod_throttle/) {
-        print "WARNING: it appears you have the mod_throttle ".
+        print "**** WARNING: it appears you have the mod_throttle ".
         "package installed.\n".
         "mod_throttle appears to conflict with LON-CAPA.\n".
         "Use the following command to remove it:\n".
@@ -71,18 +78,74 @@ foreach my $rpm (@mod_rpms) {
 }
 #
 # Look for packages which we need to be present
+my @RPMS = `rpm -q -a`;
+if ($rhversion eq "7.3") {
+    foreach my $rpm ('gnuplot-3.7.1-5','LON-CAPA-systemperl') {
+        my @matching_rpms = grep(/$rpm/,@RPMS);
+        if (! @matching_rpms) {
+            print "**** WARNING: ".$rpm." does not appear to be installed.\n";
+        }
+    }
+} else {
+    foreach my $rpm ('LONCAPA-prerequisites',
+                     'gnuplot-',
+                     'perl-IO-Socket-SSL',
+                     'perl-Net-SSLeay',
+                     'perl-Time-HiRes-1.59',
+                     'perl-GDGraph',
+                     'perl-GD',
+                     'perl-GD-Graph3d',
+                     'perl-GD-Barcode',
+                     'perl-GDTextUtil',
+                     'ImageMagick-5',
+                     'ImageMagick-perl',
+                     'perl-Algorithm-Diff',
+                     'perl-Authen-Krb4',
+                     'perl-Authen-Krb5',
+                     'perl-Authen-PAM',
+                     'perl-Crypt-DES',
+                     'perl-Crypt-IDEA',
+                     'perl-Crypt-SSLeay',
+                     'perl-Event',
+                     'perl-HTML-Tree',
+                     'perl-IO-stringy',
+                     'perl-MailTools',
+                     'perl-Math-Cephes',
+                     'perl-Math-FFT',
+                     'perl-Math-Random',
+                     'perl-Net-PH',
+                     'perl-Net-SNPP',
+                     'perl-Net-SSLeay',
+                     'perl-OLE-Storage_Lite',
+                     'perl-Parse-RecDescent',
+                     'perl-Pod-POM',
+                     'perl-PostScript-Simple',
+                     'perl-Safe-Hole',
+                     'perl-Spreadsheet-WriteExcel',
+                     'perl-String-Similarity',
+                     'perl-Text-Query',
+                     'perl-TimeDate',) {
+        my @matching_rpms = grep(/$rpm/,@RPMS);
+        if (! @matching_rpms) {
+            print "**** WARNING: ".$rpm." does not appear to be installed.\n";
+        }
+    }
+}
+
 foreach my $rpm ('psutils','openssl-devel','perl-suidperl',
-                 'gnuplot-3.7.1-5','apache-1.3','mod_perl-1') {
-    my @RPMs = `rpm -q -a | grep $rpm`;
-    if (! @RPMs) {
-        print "WARNING: ".$rpm." does not appear to be installed.\n";
+                 'apache-1.3','mod_perl.1','^gzip','^zip-',
+                 '^bzip2-libs','^unzip','^bzip2','^tar-') {
+    my @matching_rpms = grep(/$rpm/,@RPMS);
+    if (! @matching_rpms) {
+        print "**** WARNING: ".$rpm." does not appear to be installed.\n";
     }
 }
+
 #
 # Look for files which we need to be present
 foreach my $file ('/usr/bin/pstops') {
     if (! -e $file) {
-        print "WARNING: ".$file." does not appear to be installed.\n";
+        print "**** WARNING: ".$file." does not appear to be installed.\n";
     }
 }
 </perlscript>