Work on rpm package

Dolibarr · Sep 7, 2011 · 7b2e9a8 · 7b2e9a8
1 parent 0c7bd13
commit 7b2e9a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
@@ -103,8 +103,6 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/adodbtime  
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
 
 # Lang
 for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_*

diff --git a/build/rpm/install.forced.php.fedora b/build/rpm/install.forced.php.fedora
@@ -19,11 +19,11 @@ $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';
+$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';
+$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";
+#$dolibarr_lib_ODTPHP_PATHTOPCLZIP="/usr/share/php/libphp-pclzip";
 
 #$force_dolibarr_lib_GEOIP_PATH='';
 #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';