From 461f17cf5208c7c960400a27046ca7ce9e44b441 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 7 Sep 2011 13:27:50 +0000 Subject: [PATCH] Fix: definition of DOL_DOCUMENT_ROOT mus be done only into environment include files and never into class files. --- build/rpm/dolibarr_fedora.spec | 2 +- build/rpm/install.forced.php.fedora | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 81112a18cab..72a06e65304 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -25,7 +25,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Productivity -Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, php-adodb, php-nusoap, dejavu-sans-fonts +Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, dejavu-sans-fonts Requires: mysql-server, mysql #BuildRequires: desktop-file-utils diff --git a/build/rpm/install.forced.php.fedora b/build/rpm/install.forced.php.fedora index 15640318d82..b2721c6ac6a 100755 --- a/build/rpm/install.forced.php.fedora +++ b/build/rpm/install.forced.php.fedora @@ -18,13 +18,6 @@ $force_install_dolibarrlogin='admin'; $force_install_nophpinfo='1'; $force_install_lockinstall='444'; -# Value to overwrite path to use shared libraries instead of embedded one -$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; -# Value to overwrite path to use shared libraries instead of embedded one -$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; -# Value to overwrite path to use shared libraries instead of embedded one -#$dolibarr_lib_ODTPHP_PATHTOPCLZIP="/usr/share/php/libphp-pclzip"; - #$force_dolibarr_lib_GEOIP_PATH=''; #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf';