thomas: server/kolab-webadmin/kolab-webadmin/www/admin/kolab versions.php.in, 1.11, 1.12

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	versions.php.in 
Log Message:
kolab-webadmin, kolabd: Folded @amavisd_pkg@,
@emailserver_pkg@, @imap_pkg@, @webserver_pkg@, @kolab_pkg@,
@kolab_webadmin_pkg@, @kolab_filter_pkg@, @kolab_freebusy_pkg@,
@perl_kolabconf_pkg@, @perl_kolab_pkg@ and @php_kolab_pkg@ into
@kolab_pkgs@, and rename @pear_horde_pkg@ to @pear_horde_pkgs@
for consistency. List is not yet updated for new package names.
Set $kolabversion default to 'unknown' instead of the obsolete
value '2.1-official'.


Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- versions.php.in	26 Feb 2008 18:39:55 -0000	1.11
+++ versions.php.in	12 Dec 2008 10:28:55 -0000	1.12
@@ -29,23 +29,12 @@
 $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_kolabconf_pkg@ \
-    @perl_kolab_pkg@ \
-    @php_kolab_pkg@ \
     | sort
 ');
 
 $pearhordeversions = shell_exec('
   @RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
-    @pear_horde_pkg@ \
+    @pear_horde_pkgs@ \
     | sort
 ');
 
@@ -60,7 +49,7 @@
 $kolabversion = '@kolab_version@';
 if( $kolabversion[0] == '@' ) {
   // Unofficial/non-openpkg package
-  $kolabversion = '2.1-official';
+  $kolabversion = 'unknown';
 }
 
 /**** Insert into template and output ***/