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/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 9dbe838d2ad..1ae18e623cd 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,9 +1,5 @@ # This file is useless. # It is provided as example to know contexts modified by installer # to make Dolibarr working. -# -# Note: To allow temporary write permission for httpd: -# chcon -R -h -t httpd_sys_script_rw_t /dirtoallow -# /etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 /var/lib/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file 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'; diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index a4853304eda..4b04789c404 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -254,13 +254,13 @@ $dolibarr_main_prod='0'; ############################## # Value to overwrite path to use shared libraries instead of embedded one -#$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; +#$dolibarr_lib_ADODB_PATH=''; # Value to overwrite path to use shared libraries instead of embedded one #$dolibarr_lib_TCPDF_PATH=''; # Value to overwrite path to use shared libraries instead of embedded one #$dolibarr_lib_FPDFI_PATH=''; # Value to overwrite path to use shared libraries instead of embedded one -#$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap/'; +#$dolibarr_lib_NUSOAP_PATH=''; # Value to overwrite path to use shared libraries instead of embedded one #$dolibarr_lib_PHPEXCEL_PATH=''; # Value to overwrite path to use shared libraries instead of embedded one