Merge branch 'master' of main:/home/e-smith/files/shares/dev/files/ipasserelle-groupware

ipasserelle-groupware.spec

@@ -1,5 +1,5 @@
 
-%define version 0.2.0
+%define version 0.2.1
 %define release 1
 %define name ipasserelle-groupware
 
@@ -33,6 +33,9 @@ Based on smeserver-sogo from nethesis
 
 
 %changelog
+* Mon Jun 18 2012 Daniel Berteaud <daniel@firewall-services.com> - 0.2.1-1
+- 64bits compatibility
+
 * Wed Mar 14 2012 Daniel Berteaud <daniel@firewall-services.com> - 0.2.0-1.sme
 - Migrate to git
 

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess

@@ -2,8 +2,9 @@
 {
     $sogoStatus = $sogod{'status'} || "disabled";
     $webmailStatus = $imp{'status'} || "disabled";
-    $style = $sogod{'WebServerResources'} || '/usr/lib/GNUstep/SOGo/WebServerResources/';
+    my $lib = ( -d '/usr/lib64' ) ? 'lib64':'lib';
-    $style = '/usr/lib/GNUstep/SOGo/WebServerResources/' unless ( -d $style);
+    $style = $sogod{'WebServerResources'} || '/usr/' . $lib . '/GNUstep/SOGo/WebServerResources/';
+    $style = '/usr/' . $lib . '/GNUstep/SOGo/WebServerResources/' unless ( -d $style);
     $style =~ s#$#/# unless ( $style =~ m#/$# );
 
     $OUT = "";
@@ -24,7 +25,7 @@ SetEnvIf Host (.*) REQUEST_HOST=$1
 Alias /.woa/WebServerResources/ {"$style";}
 Alias /SOGo.woa/WebServerResources/ {"$style";}
 Alias /SOGo/WebServerResources/ {"$style";}
-AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) /usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2
+AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) /usr/{$lib}/GNUstep/SOGo/$1.SOGo/Resources/$2
 
 <Directory {"\"$style\"";}>
     AllowOverride None