summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Bos <richard@radoeka.nl>2008-02-13 23:01:57 (GMT)
committerRichard Bos <richard@radoeka.nl>2008-02-13 23:01:57 (GMT)
commitd632e6973dba5a650c9100f32fbcd50985286d02 (patch)
treee1f6ff2e6435617553ec9a71e0c74b7b626a7179
parentde7cd9821d4d5632025238fa3b6d691f2689b746 (diff)
downloadkolab-webadmin-d632e6973dba5a650c9100f32fbcd50985286d02.tar.gz
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.
-rw-r--r--ChangeLog6
-rw-r--r--www/admin/kolab/versions.php.in21
2 files changed, 25 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bf436f..716bf1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-13 Richard Bos <richard@radoeka.nl>
+
+ * www/admin/kolab/versions.php.in: 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
+
2008-02-11 Richard Bos <richard@radoeka.nl>
* www/admin/kolab/versions.php.in: reflect the change in removed and new rpms:
diff --git a/www/admin/kolab/versions.php.in b/www/admin/kolab/versions.php.in
index 88e37ae..d532538 100644
--- a/www/admin/kolab/versions.php.in
+++ b/www/admin/kolab/versions.php.in
@@ -24,8 +24,25 @@ $menuitems[$sidx]['selected'] = 'selected';
/**** 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]*$'" );