Work on rpm packages

build/debian/control

@@ -10,10 +10,11 @@ Package: dolibarr
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
     php5-mysql | php5-mysqli, 
     php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip, php-fpdf,
-    libnusoap-php,
-    libphp-pclzip,
+	libphp-adodb,
     libfpdi-php,
     libfpdf-tpl-php,
+    libnusoap-php,
+    libphp-pclzip,
     ckeditor,
     ttf-dejavu-core,
     xdg-utils,

build/debian/install.forced.php.install

@@ -25,6 +25,7 @@ $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
 
+$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 $force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
 $force_dolibarr_lib_GEOIP_PATH='';
 $force_dolibarr_lib_PHPEXCEL_PATH='';

build/rpm/install.forced.php.fedora

@@ -20,13 +20,10 @@ $force_install_lockinstall='444';
 
 # Value to overwrite path to use shared libraries instead of embedded one
 $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
-# Value to overwrite path to use shared libraries instead of embedded one
-$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
-# Value to overwrite path to use shared libraries instead of embedded one
-#$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP="/usr/share/php/libphp-pclzip";
-
 #$force_dolibarr_lib_GEOIP_PATH='';
+$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
+#$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
 $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf';
 
 ?>
\ No newline at end of file

build/rpm/install.forced.php.mandriva

@@ -18,8 +18,12 @@ $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
 
+# Value to overwrite path to use shared libraries instead of embedded one
+$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 #$force_dolibarr_lib_GEOIP_PATH='';
+$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
+#$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
 $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf';
 
 ?>
\ No newline at end of file

build/rpm/install.forced.php.opensuse

@@ -18,8 +18,12 @@ $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
 
+# Value to overwrite path to use shared libraries instead of embedded one
+$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 #$force_dolibarr_lib_GEOIP_PATH='';
+$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
+#$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
 $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype';
 
 ?>
\ No newline at end of file