richard: server/kolab-webadmin/kolab-webadmin/www/admin/kolab versions.php.in, 1.1, 1.2

cvs at intevation.de cvs at intevation.de
Tue Jan 17 20:20:22 CET 2006


Author: richard

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

Modified Files:
	versions.php.in 
Log Message:
use rpm package name variables for the software package version query's



Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- versions.php.in	16 Jan 2006 18:36:15 -0000	1.1
+++ versions.php.in	17 Jan 2006 19:20:20 -0000	1.2
@@ -23,9 +23,14 @@
 /**** Page logic ****/
 
 // Remember to keep this list up to date when patching packages!
-$kolabversions = shell_exec("@RPM@ -q perl-kolab kolabd kolab-resource-handlers kolab-webadmin" );
-$kolabpatchedversions = shell_exec("@RPM@ -q amavisd apache imapd postfix" );
-$openpkgversion = shell_exec("@RPM@ -q openpkg");
+$kolabversions = shell_exec("@RPM@ -q @perl_kolab_rpm@ @kolab_rpm@ @kolab_resource_handlers_rpm@ @kolab_webadmin_rpm@" );
+$kolabpatchedversions = shell_exec("@RPM@ -q @amavisd_rpm@ @webserver_rpm@ @imap_rpm@ @emailserver_rpm@" );
+
+# This is an openpkg test, difficult to see after make.
+# but visible in the vanilla sources.
+if ("@WITHOPENPKG@" == "yes") {
+	$openpkgversion = shell_exec("@RPM@ -q openpkg");
+}
 
 $kolabversion = '@kolab_version@';
 if( $kolabversion[0] == '@' ) {





More information about the commits mailing list