--- doc/loncapafiles/rpmcheck.piml	2004/05/25 15:55:04	1.4
+++ doc/loncapafiles/rpmcheck.piml	2011/10/25 13:01:32	1.25
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: rpmcheck.piml,v 1.4 2004/05/25 15:55:04 matthew Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.25 2011/10/25 13:01:32 raeburn Exp $ -->
 
 <!--
 
@@ -34,12 +34,12 @@ http://www.lon-capa.org/
 <files>
 <file>
 <target dist="default">/home/httpd/lonUsers</target>
-<perlscript mode="fg">
+<perlscript dist="redhat7 fedora1 fedora2 fedora3 fedora4 suse9.2 suse9.3 sles9" mode="fg">
 #
 # 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 +54,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".
@@ -69,20 +69,65 @@ foreach my $rpm (@mod_rpms) {
     }
         
 }
+</perlscript>
+<perlscript dist="redhat7" mode="fg">
 #
 # Look for packages which we need to be present
-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";
+my @RPMS = `rpm -q -a`;
+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";
     }
 }
+</perlscript>
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 rhes5 rhes6 centos5 scientific5 scientific6 centos6 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 suse11.1 suse11.2 suse11.3 suse11.4" mode="fg">
+my $hasprereqs = 0;
+if (open(PIPE,"rpm -q LONCAPA-prerequisites|")) {
+    my @lines = (&lt;PIPE&gt;);
+    close(PIPE);
+    chomp(@lines);
+    foreach my $line (@lines) {
+        if ($line =~ /^\QLONCAPA-prerequisites-\E[.\w\-]+$/) {
+            $hasprereqs = 1;
+            last;
+        }
+    }
+}
+if (!$hasprereqs) {
+    print "**** WARNING: LONCAPA-prerequisites does not appear to be installed.\n";
+}
+</perlscript>
+<perlscript dist="debian5 debian6 ubuntu8 ubuntu10" mode="fg">
+my $hasprereqs = 0;
+if (open(PIPE,"dpkg -l loncapa-prerequisites|")) {
+    my @lines = (&lt;PIPE&gt;);
+    close(PIPE);
+    chomp(@lines);
+    foreach my $line (@lines) { 
+        if ($line =~ /^ii\s+\Qloncapa-prerequisites\E\s+([.\d\-]+)/) {
+            $hasprereqs = 1;
+            last;
+        }
+    }
+}
+if (!$hasprereqs) { 
+    print "**** WARNING: loncapa-prerequisites does not appear to be installed.\n";
+}
+</perlscript>
+<perlscript dist="gentoo">
+print &lt;&lt;END;
+**** WARNING: We don't know much about your distribution.
+    Check with the loncapa development team for help satisfying 
+    the many dependencies of LON-CAPA.
+END
+</perlscript>
+<perlscript mode="fg">
 #
 # 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>