--- doc/loncapafiles/rpmcheck.piml	2004/12/10 20:40:08	1.9
+++ doc/loncapafiles/rpmcheck.piml	2014/12/31 21:03:54	1.35
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: rpmcheck.piml,v 1.9 2004/12/10 20:40:08 matthew Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.35 2014/12/31 21:03:54 raeburn Exp $ -->
 
 <!--
 
@@ -34,7 +34,7 @@ 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`;
@@ -81,16 +81,41 @@ foreach my $rpm ('gnuplot-3.7.1-5','LON-
     }
 }
 </perlscript>
-<perlscript dist="fedora1 fedora2 fedora3" mode="fg">
-my @RPMS = `rpm -q -a`;
-foreach my $rpm ('LONCAPA-prerequisites') {
-    my @matching_rpms = grep(/$rpm/,@RPMS);
-    if (! @matching_rpms) {
-        print "**** WARNING: ".$rpm." does not appear to be installed.\n";
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 rhes5 rhes6 rhes7 centos5 scientific5 scientific6 centos6 scientific7 centos7 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1" 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="debian gentoo sles suse">
+<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