--- doc/loncapafiles/rpmcheck.piml	2010/12/31 18:03:46	1.20
+++ doc/loncapafiles/rpmcheck.piml	2012/10/05 15:36:21	1.28
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: rpmcheck.piml,v 1.20 2010/12/31 18:03:46 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.28 2012/10/05 15:36:21 raeburn Exp $ -->
 
 <!--
 
@@ -81,16 +81,41 @@ foreach my $rpm ('gnuplot-3.7.1-5','LON-
     }
 }
 </perlscript>
-<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedra14 rhel6 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 suse11.1 suse11.2" 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 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 suse12.1 suse12.2" 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">
+<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