richard: server/kolab-webadmin/kolab-webadmin/www/admin/kolab versions.php.in, 1.7, 1.8

[cvs at kolab.org]

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab
In directory doto:/tmp/cvs-serv28391/www/admin/kolab

Modified Files:
	versions.php.in 
Log Message:
reflect the change in package variable name (new suffix _pkg instead of _rpm).
Added the variable kolab_pkgs, and splitted the name and version in the output.



Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- versions.php.in	11 Feb 2008 20:51:27 -0000	1.7
+++ versions.php.in	13 Feb 2008 23:01:57 -0000	1.8
@@ -24,8 +24,25 @@
 /**** Page logic ****/
 
 // Remember to keep this list up to date when patching packages!
-$kolabversions = shell_exec("@RPM@ -q @perl_kolab_rpm@ @kolab_rpm@ @kolab_webadmin_rpm@ @kolab-filter_rpm@ @kolab-freebusy_rpm@ @perl-kolab-conf_rpm@ @php-pear-kolab_filter_rpm@ @php-pear-kolab_freebusy_rpm@" 
-);
+// The variable @kolab_pkgs@ is used to collect a packages that make up the
+// kolab groupware server.
+$kolabversions = shell_exec('
+  @RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
+    @kolab_pkgs@ \
+    @amavisd_pkg@ \
+    @emailserver_pkg@ \
+    @imap_pkg@ \
+    @webserver_pkg@ \
+    @kolab_pkg@ \
+    @kolab_webadmin_pkg@ \
+    @kolab-filter_pkg@ \
+    @kolab-freebusy_pkg@ \
+    @perl-kolab-conf_pkg@ \
+    @perl_kolab_pkg@ \
+    @php-pear-kolab_filter_pkg@ \
+    @php-pear-kolab_freebusy_pkg@ |
+    sort
+');
 
 $kolabpatchedversions = shell_exec("@RPM@ -qa|grep 'kolab[0-9]*$'" );