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

cvs at kolab.org cvs at kolab.org
Tue Feb 26 19:39:57 CET 2008


Author: thomas

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

Modified Files:
	versions.php.in 
Log Message:
About Kolab -> Versions: Separate PEAR/Horde section, s/-/_ in autoconf vars.

kolab/issue2203 (About Kolab does not list new server components)


Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- versions.php.in	17 Feb 2008 14:15:57 -0000	1.10
+++ versions.php.in	26 Feb 2008 18:39:55 -0000	1.11
@@ -35,13 +35,18 @@
     @webserver_pkg@ \
     @kolab_pkg@ \
     @kolab_webadmin_pkg@ \
-    @kolab-filter_pkg@ \
-    @kolab-freebusy_pkg@ \
-    @perl-kolab-conf_pkg@ \
+    @kolab_filter_pkg@ \
+    @kolab_freebusy_pkg@ \
+    @perl_kolabconf_pkg@ \
     @perl_kolab_pkg@ \
-    @php-pear-kolab_filter_pkg@ \
-    @php-pear-kolab_freebusy_pkg@ |
-    sort
+    @php_kolab_pkg@ \
+    | sort
+');
+
+$pearhordeversions = shell_exec('
+  @RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
+    @pear_horde_pkg@ \
+    | sort
 ');
 
 
@@ -68,6 +73,7 @@
 $smarty->assign( 'submenuitems', $menuitems[$sidx]['submenu'] );
 $smarty->assign( 'kolabversion',  $kolabversion );
 $smarty->assign( 'kolabversions', $kolabversions );
+$smarty->assign( 'pearhordeversions', $pearhordeversions );
 $smarty->assign( 'kolabpatchedversions', $kolabpatchedversions );
 $smarty->assign( 'openpkgversion', $openpkgversion );
 $smarty->assign( 'maincontent', 'versions.tpl' );





More information about the commits mailing list