diff --git a/build/rpm/dolibarr-forrpm.patch b/build/rpm/dolibarr-forrpm.patch
new file mode 100755
index 00000000000..d7b0037d59d
--- /dev/null
+++ b/build/rpm/dolibarr-forrpm.patch
@@ -0,0 +1,42 @@
+diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
+--- htdocs/filefunc.inc.php.patch	2011-09-03 02:32:48.666952000 +0200
++++ htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
+@@ -65,8 +65,8 @@ $conffiletoshowshort = "conf.php";
+ $conffile = "conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ # For debian/redhat like systems
+-#$conffile = "/etc/dolibarr/conf.php";
+-#$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
+ // Include configuration
+diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
+--- htdocs/install/inc.php.patch	2011-09-03 02:33:26.450952000 +0200
++++ htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
+@@ -75,8 +75,8 @@ $conffiletoshowshort = "conf.php";
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ # For debian/redhat like systems
+-#$conffile = "/etc/dolibarr/conf.php";
+-#$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
+ if (! defined('DONOTLOADCONF') && file_exists($conffile))
+diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
+--- htdocs/support/inc.php.patch	2011-09-03 02:34:39.606952000 +0200
++++ htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
+@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ # For debian/redhat like systems
+-#$conffile = "/etc/dolibarr/conf.php";
+-#$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ $charset="UTF-8";	// If not output format found in any conf file
+ if (! defined('DONOTLOADCONF') && file_exists($conffile))
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 87da5c20a4c..78710106a50 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -10,7 +10,7 @@ Name: dolibarr
 Version: __VERSION__
 Release: __RELEASE__%{?dist}
 Summary: ERP and CRM software for small and medium companies or foundations 
-Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
+Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones o autónomos
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
 
@@ -20,12 +20,13 @@ Vendor: Dolibarr dev team
 
 URL: http://www.dolibarr.org
 Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz
+Patch0: %{name}-forrpm.patch
 BuildArch: noarch
-#BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
-Group: Applications/Internet
-Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql 
+Group: Applications/Productivity
+Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql dejavu-sans-fonts
+#BuildRequires: desktop-file-utils
 
 # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
 AutoReqProv: no
@@ -67,6 +68,7 @@ cui hai bisogno ed essere facile da usare.
 #---- prep
 %prep
 %setup -q
+%patch0 -p0 -b .patch
 
 
 
@@ -81,26 +83,25 @@ cui hai bisogno ed essere facile da usare.
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr
-%{__install} -m 644 etc/dolibarr/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php
-%{__install} -m 644 etc/dolibarr/install.forced.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php
-%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
-%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
+%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php
+%{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
+%{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
+%{__install} -m 644 build/rpm/install.forced.php.fedora $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php
 
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 usr/share/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
+%{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
-#desktop-file-install -m 644 usr/share/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
-%{__install} -m 644 usr/share/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
+#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/dolibarr.desktop
+%{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
 
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build
+%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
+%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
 %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs
 %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/doc/dolibarr
-%{__cp} -pr usr/share/dolibarr/build   $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr usr/share/dolibarr/htdocs  $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr usr/share/dolibarr/scripts $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr usr/share/dolibarr/doc/*   $RPM_BUILD_ROOT/usr/share/doc/dolibarr
-%{__install} -m 644 usr/share/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/usr/share/doc/dolibarr/COPYRIGHT
+%{__cp} -pr build/rpm/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
+%{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
+%{__cp} -pr htdocs  $RPM_BUILD_ROOT/usr/share/dolibarr
+%{__cp} -pr scripts $RPM_BUILD_ROOT/usr/share/dolibarr
 
 
 #---- clean
@@ -112,16 +113,20 @@ cui hai bisogno ed essere facile da usare.
 #---- files
 %files
 
-%defattr(-, root, root, 0755)
-%doc %_datadir/doc/dolibarr
-%dir %_datadir/dolibarr/build
-%dir %_datadir/dolibarr/htdocs
+%defattr(0755, root, root, 0755)
 %dir %_datadir/dolibarr/scripts
+%_datadir/dolibarr/scripts/*
+
+%defattr(-, root, root, 0755)
+%doc COPYING ChangeLog doc/index.html
+%dir %_datadir/dolibarr/build/rpm
+%dir %_datadir/dolibarr/build/tgz
+%dir %_datadir/dolibarr/htdocs
 %_datadir/pixmaps/dolibarr.png
 %_datadir/applications/dolibarr.desktop
-%_datadir/dolibarr/build/*
+%_datadir/dolibarr/build/rpm/*
+%_datadir/dolibarr/build/tgz/*
 %_datadir/dolibarr/htdocs/*
-%_datadir/dolibarr/scripts/*
 
 %defattr(0664, -, -)
 %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
@@ -140,7 +145,7 @@ export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
 export apacheuser='apache';
 export apachegroup='apache';
 
-# Remove lock file
+# Remove dolibarr install/upgrade lock file if it exists
 %{__rm} -f $docdir/install.lock
 
 # Create empty directory for uploaded files and generated documents 
@@ -187,13 +192,13 @@ fi
 
 # Show result
 echo
-echo "----- Dolibarr %version - (c) Dolibarr dev team -----"
+echo "----- Dolibarr %version-%release - (c) Dolibarr dev team -----"
 echo "Dolibarr files are now installed (into /usr/share/dolibarr)."
 echo "To finish installation and use Dolibarr, click on the menu" 
 echo "entry Dolibarr ERP-CRM or call the following page from your"
 echo "web browser:"  
 echo "http://localhost/dolibarr/"
-echo "--------------------------------------------------"
+echo "-------------------------------------------------------"
 echo
 
 
@@ -206,7 +211,7 @@ export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
 # Remove apache link
 if [ -L $apachelink ] ;
 then
-    echo Delete apache config link for Dolibarr
+    echo "Delete apache config link for Dolibarr ($apachelink)"
     %{__rm} -f $apachelink
     status=purge
 fi
@@ -227,5 +232,5 @@ fi
 
 
 %changelog
-* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
+* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 29edde8e285..649cacf0451 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -10,7 +10,7 @@ Name: dolibarr
 Version: __VERSION__
 Release: __RELEASE__
 Summary: ERP and CRM software for small and medium companies or foundations 
-Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
+Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones o autónomos
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
 
@@ -143,9 +143,9 @@ cui hai bisogno ed essere facile da usare.
 #lang(en_GB) %_datadir/dolibarr/htdocs/langs/el_GB
 #lang(en_IN) %_datadir/dolibarr/htdocs/langs/el_IN
 #lang(en_NZ) %_datadir/dolibarr/htdocs/langs/el_NZ
-#lang(en) %_datadir/dolibarr/htdocs/langs/en_US
+#lang(en)    %_datadir/dolibarr/htdocs/langs/en_US
 #lang(es_AR) %_datadir/dolibarr/htdocs/langs/es_AR
-#lang(es) %_datadir/dolibarr/htdocs/langs/es_ES
+#lang(es)    %_datadir/dolibarr/htdocs/langs/es_ES
 #lang(es_HN) %_datadir/dolibarr/htdocs/langs/es_HN
 #lang(es_MX) %_datadir/dolibarr/htdocs/langs/en_MX
 #lang(es_PR) %_datadir/dolibarr/htdocs/langs/en_PR
@@ -154,7 +154,7 @@ cui hai bisogno ed essere facile da usare.
 #lang(fr_BE) %_datadir/dolibarr/htdocs/langs/fr_BE
 #lang(fr_CA) %_datadir/dolibarr/htdocs/langs/fr_CA
 #lang(fr_CH) %_datadir/dolibarr/htdocs/langs/fr_CH
-#lang(fr) %_datadir/dolibarr/htdocs/langs/fr_FR
+#lang(fr)    %_datadir/dolibarr/htdocs/langs/fr_FR
 
 
 
@@ -291,7 +291,7 @@ fi
 # Remove apache link
 if [ -L $apachelink ] ;
 then
-    echo Delete apache config link for Dolibarr
+    echo "Delete apache config link for Dolibarr ($apachelink)"
     %{__rm} -f $apachelink
     status=purge
 fi
@@ -312,5 +312,5 @@ fi
 
 
 %changelog
-* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
+* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 79df79dcf40..0908c92ce7a 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -10,7 +10,7 @@ Name: dolibarr
 Version: __VERSION__
 Release: __RELEASE__
 Summary: ERP and CRM software for small and medium companies or foundations 
-Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
+Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones o autónomos
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
 
@@ -20,12 +20,12 @@ Vendor: Dolibarr dev team
 
 URL: http://www.dolibarr.org
 Source0: http://www.dolibarr.org/files/mandriva/%{name}-%{version}.tgz
+Patch0: %{name}-forrpm.patch
 BuildArch: noarch
-#BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
-Group: Networking/WWW
-Requires: mysql mysql-client apache-base apache-mod_php php-cgi php-cli php-bz2 php-gd php-ldap php-imap php-mysqli php-openssl 
+Group: Applications/Productivity
+Requires: mysql mysql-client apache-base apache-mod_php php-cgi php-cli php-bz2 php-gd php-ldap php-imap php-mysqli php-openssl fonts-ttf-dejavu 
 
 # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
 AutoReqProv: no
@@ -67,6 +67,7 @@ cui hai bisogno ed essere facile da usare.
 #---- prep
 %prep
 %setup -q
+%patch0 -p0 -b .patch
 
 
 
@@ -81,25 +82,25 @@ cui hai bisogno ed essere facile da usare.
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr
-%{__install} -m 644 etc/dolibarr/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php
-%{__install} -m 644 etc/dolibarr/install.forced.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php
-%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
-%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
+%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php
+%{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
+%{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
+%{__install} -m 644 build/rpm/install.forced.php.fedora $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php
 
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 usr/share/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
+%{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
-%{__install} -m 644 usr/share/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
+#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/dolibarr.desktop
+%{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
 
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build
+%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
+%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
 %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs
 %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/doc/dolibarr
-%{__cp} -pr usr/share/dolibarr/build   $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr usr/share/dolibarr/htdocs  $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr usr/share/dolibarr/scripts $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr usr/share/dolibarr/doc/*   $RPM_BUILD_ROOT/usr/share/doc/dolibarr
-%{__install} -m 644 usr/share/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/usr/share/doc/dolibarr/COPYRIGHT
+%{__cp} -pr build/rpm/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
+%{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
+%{__cp} -pr htdocs  $RPM_BUILD_ROOT/usr/share/dolibarr
+%{__cp} -pr scripts $RPM_BUILD_ROOT/usr/share/dolibarr
 
 
 #---- clean
@@ -111,16 +112,20 @@ cui hai bisogno ed essere facile da usare.
 #---- files
 %files
 
-%defattr(-, root, root, 0755)
-%doc %_datadir/doc/dolibarr
-%dir %_datadir/dolibarr/build
-%dir %_datadir/dolibarr/htdocs
+%defattr(0755, root, root, 0755)
 %dir %_datadir/dolibarr/scripts
+%_datadir/dolibarr/scripts/*
+
+%defattr(-, root, root, 0755)
+%doc COPYING ChangeLog doc/index.html
+%dir %_datadir/dolibarr/build/rpm
+%dir %_datadir/dolibarr/build/tgz
+%dir %_datadir/dolibarr/htdocs
 %_datadir/pixmaps/dolibarr.png
 %_datadir/applications/dolibarr.desktop
-%_datadir/dolibarr/build/*
+%_datadir/dolibarr/build/rpm/*
+%_datadir/dolibarr/build/tgz/*
 %_datadir/dolibarr/htdocs/*
-%_datadir/dolibarr/scripts/*
 
 %defattr(0664, -, -)
 %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
@@ -139,7 +144,7 @@ export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
 export apacheuser='apache';
 export apachegroup='apache';
 
-# Remove lock file
+# Remove dolibarr install/upgrade lock file if it exists
 %{__rm} -f $docdir/install.lock
 
 # Create empty directory for uploaded files and generated documents 
@@ -176,13 +181,13 @@ fi
 
 # Show result
 echo
-echo "----- Dolibarr %version - (c) Dolibarr dev team -----"
+echo "----- Dolibarr %version-%release - (c) Dolibarr dev team -----"
 echo "Dolibarr files are now installed (into /usr/share/dolibarr)."
 echo "To finish installation and use Dolibarr, click on the menu" 
 echo "entry Dolibarr ERP-CRM or call the following page from your"
 echo "web browser:"  
 echo "http://localhost/dolibarr/"
-echo "--------------------------------------------------"
+echo "-------------------------------------------------------"
 echo
 
 
@@ -195,7 +200,7 @@ export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
 # Remove apache link
 if [ -L $apachelink ] ;
 then
-    echo Delete apache config link for Dolibarr
+    echo "Delete apache config link for Dolibarr ($apachelink)"
     %{__rm} -f $apachelink
     status=purge
 fi
@@ -216,5 +221,5 @@ fi
 
 
 %changelog
-* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
+* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index f785d3f41b1..9b235945526 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -10,7 +10,7 @@ Name: dolibarr
 Version: __VERSION__
 Release: __RELEASE__
 Summary: ERP and CRM software for small and medium companies or foundations 
-Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos
+Summary(es): Software ERP y CRM para pequeñas y medianas empresas, asociaciones o autónomos
 Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations
 Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti
 
@@ -20,12 +20,12 @@ Vendor: Dolibarr dev team
 
 URL: http://www.dolibarr.org
 Source0: http://www.dolibarr.org/files/opensuse/%{name}-%{version}.tgz
+Patch0: %{name}-forrpm.patch
 BuildArch: noarch
-#BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
-Group: Applications/Internet
-Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl 
+Group: Productivity/Office/Management
+Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl fonts-ttf-dejavu 
 
 # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
 AutoReqProv: no
@@ -67,6 +67,7 @@ cui hai bisogno ed essere facile da usare.
 #---- prep
 %prep
 %setup -q
+%patch0 -p0 -b .patch
 
 
 #---- build
@@ -79,26 +80,31 @@ cui hai bisogno ed essere facile da usare.
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr
-%{__install} -m 644 etc/dolibarr/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php
-%{__install} -m 644 etc/dolibarr/install.forced.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php
-%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
-%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
+%{__install} -m 644 build/rpm/conf.php $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/conf.php
+%{__install} -m 644 build/rpm/httpd-dolibarr.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf
+%{__install} -m 644 build/rpm/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr
+%{__install} -m 644 build/rpm/install.forced.php.fedora $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/install.forced.php
 
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 usr/share/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
+%{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
-%{__install} -m 644 usr/share/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
+#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/dolibarr.desktop
+%{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop
 
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build
+%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
+%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
 %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs
 %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts
-%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/doc/dolibarr
-%{__cp} -pr usr/share/dolibarr/build   $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr usr/share/dolibarr/htdocs  $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr usr/share/dolibarr/scripts $RPM_BUILD_ROOT/usr/share/dolibarr
-%{__cp} -pr usr/share/dolibarr/doc/*   $RPM_BUILD_ROOT/usr/share/doc/dolibarr
-%{__install} -m 644 usr/share/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/usr/share/doc/dolibarr/COPYRIGHT
+%{__cp} -pr build/rpm/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm
+%{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz
+%{__cp} -pr htdocs  $RPM_BUILD_ROOT/usr/share/dolibarr
+%{__cp} -pr scripts $RPM_BUILD_ROOT/usr/share/dolibarr
 
+# Enable this command to tag desktop file for suse
+#%suse_update_desktop_file dolibarr
+
+# Enable this command to allow suse detection of duplicate files and create hardlinks instead
+#%fdupes
 
 
 #---- clean
@@ -110,16 +116,20 @@ cui hai bisogno ed essere facile da usare.
 #---- files
 %files
 
-%defattr(-, root, root, 0755)
-%doc %_datadir/doc/dolibarr
-%dir %_datadir/dolibarr/build
-%dir %_datadir/dolibarr/htdocs
+%defattr(0755, root, root, 0755)
 %dir %_datadir/dolibarr/scripts
+%_datadir/dolibarr/scripts/*
+
+%defattr(-, root, root, 0755)
+%doc COPYING ChangeLog doc/index.html
+%dir %_datadir/dolibarr/build/rpm
+%dir %_datadir/dolibarr/build/tgz
+%dir %_datadir/dolibarr/htdocs
 %_datadir/pixmaps/dolibarr.png
 %_datadir/applications/dolibarr.desktop
-%_datadir/dolibarr/build/*
+%_datadir/dolibarr/build/rpm/*
+%_datadir/dolibarr/build/tgz/*
 %_datadir/dolibarr/htdocs/*
-%_datadir/dolibarr/scripts/*
 
 %defattr(0664, -, -)
 %config(noreplace) %{_sysconfdir}/dolibarr/conf.php
@@ -138,7 +148,7 @@ export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
 export apacheuser='wwwrun';
 export apachegroup='www';
 
-# Remove lock file
+# Remove dolibarr install/upgrade lock file if it exists
 %{__rm} -f $docdir/install.lock
 
 # Create empty directory for uploaded files and generated documents 
@@ -175,13 +185,13 @@ fi
 
 # Show result
 echo
-echo "----- Dolibarr %version - (c) Dolibarr dev team -----"
+echo "----- Dolibarr %version-%release - (c) Dolibarr dev team -----"
 echo "Dolibarr files are now installed (into /usr/share/dolibarr)."
 echo "To finish installation and use Dolibarr, click on the menu" 
 echo "entry Dolibarr ERP-CRM or call the following page from your"
 echo "web browser:"  
 echo "http://localhost/dolibarr/"
-echo "--------------------------------------------------"
+echo "-------------------------------------------------------"
 echo
 
 
@@ -194,7 +204,7 @@ export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
 # Remove apache link
 if [ -L $apachelink ] ;
 then
-    echo Delete apache config link for Dolibarr
+    echo "Delete apache config link for Dolibarr ($apachelink)"
     %{__rm} -f $apachelink
     status=purge
 fi
@@ -215,5 +225,5 @@ fi
 
 
 %changelog
-* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
+* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a
 - Initial version (#723326)
diff --git a/build/rpm/install.forced.php.fedora b/build/rpm/install.forced.php.fedora
new file mode 100755
index 00000000000..b2721c6ac6a
--- /dev/null
+++ b/build/rpm/install.forced.php.fedora
@@ -0,0 +1,25 @@
+<?php
+
+$force_install_packager='rpmfedora';
+$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_message='KeepDefaultValuesDeb';
+$force_install_main_data_root='/var/lib/dolibarr/documents';
+$force_install_type='mysqli';
+$force_install_dbserver='localhost';
+$force_install_port='3306';
+$force_install_database='dolibarrrpm';
+$force_install_createdatabase='1';
+$force_install_databaselogin='dolibarrrpm';
+$force_install_databasepass='';
+$force_install_createuser='1';
+$force_install_databaserootlogin='__SUPERUSERLOGIN__';
+$force_install_databaserootpass='__SUPERUSERPASSWORD__';
+$force_install_dolibarrlogin='admin';
+$force_install_nophpinfo='1';
+$force_install_lockinstall='444';
+
+#$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';
+
+?>
\ No newline at end of file
diff --git a/build/rpm/install.forced.php.generic b/build/rpm/install.forced.php.generic
new file mode 100755
index 00000000000..0d8b1214ad1
--- /dev/null
+++ b/build/rpm/install.forced.php.generic
@@ -0,0 +1,21 @@
+<?php
+
+$force_install_packager='rpmgeneric';
+$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_message='KeepDefaultValuesDeb';
+$force_install_main_data_root='/var/lib/dolibarr/documents';
+$force_install_type='mysqli';
+$force_install_dbserver='localhost';
+$force_install_port='3306';
+$force_install_database='dolibarrrpm';
+$force_install_createdatabase='1';
+$force_install_databaselogin='dolibarrrpm';
+$force_install_databasepass='';
+$force_install_createuser='1';
+$force_install_databaserootlogin='__SUPERUSERLOGIN__';
+$force_install_databaserootpass='__SUPERUSERPASSWORD__';
+$force_install_dolibarrlogin='admin';
+$force_install_nophpinfo='1';
+$force_install_lockinstall='444';
+
+?>
\ No newline at end of file
diff --git a/build/rpm/install.forced.php.mandriva b/build/rpm/install.forced.php.mandriva
new file mode 100755
index 00000000000..2f831fa85e2
--- /dev/null
+++ b/build/rpm/install.forced.php.mandriva
@@ -0,0 +1,25 @@
+<?php
+
+$force_install_packager='rpmmandriva';
+$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_message='KeepDefaultValuesDeb';
+$force_install_main_data_root='/var/lib/dolibarr/documents';
+$force_install_type='mysqli';
+$force_install_dbserver='localhost';
+$force_install_port='3306';
+$force_install_database='dolibarrrpm';
+$force_install_createdatabase='1';
+$force_install_databaselogin='dolibarrrpm';
+$force_install_databasepass='';
+$force_install_createuser='1';
+$force_install_databaserootlogin='__SUPERUSERLOGIN__';
+$force_install_databaserootpass='__SUPERUSERPASSWORD__';
+$force_install_dolibarrlogin='admin';
+$force_install_nophpinfo='1';
+$force_install_lockinstall='444';
+
+#$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/TTF/dejavu/DejaVuSans-Bold.ttf';
+
+?>
\ No newline at end of file
diff --git a/build/rpm/install.forced.php.opensuse b/build/rpm/install.forced.php.opensuse
new file mode 100755
index 00000000000..de90d26792e
--- /dev/null
+++ b/build/rpm/install.forced.php.opensuse
@@ -0,0 +1,25 @@
+<?php
+
+$force_install_packager='rpmopensuse';
+$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_message='KeepDefaultValuesDeb';
+$force_install_main_data_root='/var/lib/dolibarr/documents';
+$force_install_type='mysqli';
+$force_install_dbserver='localhost';
+$force_install_port='3306';
+$force_install_database='dolibarrrpm';
+$force_install_createdatabase='1';
+$force_install_databaselogin='dolibarrrpm';
+$force_install_databasepass='';
+$force_install_createuser='1';
+$force_install_databaserootlogin='__SUPERUSERLOGIN__';
+$force_install_databaserootpass='__SUPERUSERPASSWORD__';
+$force_install_dolibarrlogin='admin';
+$force_install_nophpinfo='1';
+$force_install_lockinstall='444';
+
+#$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/truetype';
+
+?>
\ No newline at end of file