From 01abbe07c5e8d1e13842bb3d4c650bcd694c0e74 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 18 Jun 2012 22:25:51 +0200 Subject: [PATCH 1/2] =?UTF-8?q?compatibilit=C3=A9=2064bits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess index bd1d8d4..33bc9f6 100644 --- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess +++ b/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/'; - $style = '/usr/lib/GNUstep/SOGo/WebServerResources/' unless ( -d $style); + my $lib = ( -d '/usr/lib64' ) ? 'lib64':'lib'; + $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 AllowOverride None From e508a1f8f55d9b2ef8d83f359b3b7b6998d8bc80 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 18 Jun 2012 23:00:51 +0200 Subject: [PATCH 2/2] =?UTF-8?q?mise=20=C3=A0=20jour=20du=20fichier=20spec?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ipasserelle-groupware.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipasserelle-groupware.spec b/ipasserelle-groupware.spec index 7fbb668..3bd4898 100644 --- a/ipasserelle-groupware.spec +++ b/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 - 0.2.1-1 +- 64bits compatibility + * Wed Mar 14 2012 Daniel Berteaud - 0.2.0-1.sme - Migrate to git