diff --git a/product/ERP5/spec/CMFActivity.spec b/product/ERP5/spec/CMFActivity.spec
index 8cba8915b437b292ca01303734f02fb00f9d10c8..bb53b1717d25a6e791709e16cd9c25fb04709b2f 100755
--- a/product/ERP5/spec/CMFActivity.spec
+++ b/product/ERP5/spec/CMFActivity.spec
@@ -1,6 +1,6 @@
 Name:               CMFActivity
 Summary:            Activity Tool for zope
-Version:            0.1
+Version:            0.8
 Release:            1mdk
 Group:              Development/Python
 Requires:           zope
@@ -36,16 +36,22 @@ install %{name}-%{version}/*.png $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Produ
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Activity
 install %{name}-%{version}/Activity/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Activity
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Constraint
+install %{name}-%{version}/Constraint/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Constraint
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
+install %{name}-%{version}/Document/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/dtml
 install %{name}-%{version}/dtml/*.dtml $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/dtml
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/help
 install %{name}-%{version}/help/*.stx $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/help
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
+install %{name}-%{version}/Interface/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
+install %{name}-%{version}/PropertySheet/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/activity
 install %{name}-%{version}/skins/activity/*.zsql $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/activity
+install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/tests
+install %{name}-%{version}/tests/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/tests
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -56,5 +62,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/zope/lib/python/Products/%{name}/
 #----------------------------------------------------------------------
 %changelog
+* Tue Sep 01 2004 Sebastien Robin <seb@nexedi.com> 0.8-1mdk
+- Final relase for Mandrake 10.1
+
+* Mon Jun 14 2004 Sebastien Robin <seb@nexedi.com> 0.1-2mdk
+- New release for Mandrake 10.1
+
 * Mon Feb 09 2004 Sebastien Robin <seb@nexedi.com> 0.1-1nxd
 - Create the spec file
diff --git a/product/ERP5/spec/CMFCategory.spec b/product/ERP5/spec/CMFCategory.spec
index a2470be0e1628c8ec3e09c12528878664bb84a37..fac866c39b19d96709834587bce3a659f36d71e7 100755
--- a/product/ERP5/spec/CMFCategory.spec
+++ b/product/ERP5/spec/CMFCategory.spec
@@ -1,7 +1,7 @@
 Name:               CMFCategory
 Summary:            All algorithms related to categories and relations in CMF
-Version:            0.1
-Release:            4mdk
+Version:            0.8
+Release:            1mdk
 Group:              Development/Python
 Requires:           zope
 License:            GPL
@@ -44,13 +44,17 @@ install %{name}-%{version}/Constraint/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/py
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/doc
 install %{name}-%{version}/doc/*.txt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/doc
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
+install %{name}-%{version}/Document/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/dtml
 install %{name}-%{version}/dtml/*.dtml $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/dtml
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/help
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
+install %{name}-%{version}/Interface/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
 install %{name}-%{version}/PropertySheet/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins
+install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/tests
+install %{name}-%{version}/tests/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/tests
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/www
 install %{name}-%{version}/www/*.png $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/www
 %clean
@@ -63,6 +67,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/zope/lib/python/Products/%{name}/
 #----------------------------------------------------------------------
 %changelog
+* Tue Sep 01 2004 Sebastien Robin <seb@nexedi.com> 0.8-1mdk
+- Final relase for Mandrake 10.1
+
+* Mon Jun 14 2004 Sebastien Robin <seb@nexedi.com> 0.1-5mdk
+- New release for Mandrake 10.1
+
 * Tue Feb 17 2004 Sebastien Robin <seb@nexedi.com> 0.1-4mdk
 - New release before mandrake 10
 
diff --git a/product/ERP5/spec/CPS.spec b/product/ERP5/spec/CPS.spec
index 6a59f6fa91b2c29a8e1e1642de7af14a8eda4dd8..531dfa814d106c4eeafffc8293e7a07c4f24685a 100755
--- a/product/ERP5/spec/CPS.spec
+++ b/product/ERP5/spec/CPS.spec
@@ -1,7 +1,7 @@
 Name:               CPS
 Summary:            internal or external web content strategy in a collaborative approach
-Version:            3.0rc2
-Release:            2mdk
+Version:            3.0rc3
+Release:            3mdk
 Group:              Development/Python
 Requires:           zope BTreeFolder2 Localizer TranslationService CMF
 License:            GPL
@@ -36,6 +36,7 @@ install %{name}-%{version}/CPSCore/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/pytho
 install %{name}-%{version}/CPSCore/*.txt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/CPSCore
 install %{name}-%{version}/CPSCore/*.gif $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/CPSCore
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/CPSCore/doc
+install %{name}-%{version}/CPSCore/doc/*.txt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/CPSCore/doc
 install %{name}-%{version}/CPSCore/doc/*.stx $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/CPSCore/doc
 install %{name}-%{version}/CPSCore/doc/*.html $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/CPSCore/doc
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/CPSCore/zmi
@@ -176,11 +177,12 @@ install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/NuxUserGroups
 install %{name}-%{version}/NuxUserGroups/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/NuxUserGroups
 install %{name}-%{version}/NuxUserGroups/*.txt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/NuxUserGroups
 install %{name}-%{version}/NuxUserGroups/*.gif $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/NuxUserGroups
+install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/NuxUserGroups/tests
+install %{name}-%{version}/NuxUserGroups/tests/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/NuxUserGroups/tests
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/NuxUserGroups/zmi
 install %{name}-%{version}/NuxUserGroups/zmi/*.dtml $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/NuxUserGroups/zmi
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/PluggableUserFolder
 install %{name}-%{version}/PluggableUserFolder/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/PluggableUserFolder
-install %{name}-%{version}/PluggableUserFolder/*.txt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/PluggableUserFolder
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/PluggableUserFolder/doc
 install %{name}-%{version}/PluggableUserFolder/doc/*.txt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/PluggableUserFolder/doc
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/PluggableUserFolder/zmi
@@ -241,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/zope/lib/python/Products/PortalTransforms/
 #----------------------------------------------------------------------
 %changelog
+* Tue Feb 24 2004 Sebastien Robin <seb@nexedi.com> 3.0rc2-3mdk
+- Updated to rc3
+
 * Tue Feb 06 2004 Sebastien Robin <seb@nexedi.com> 3.0rc2-2mdk
 - Initial Release
 
diff --git a/product/ERP5/spec/Coramy.spec b/product/ERP5/spec/Coramy.spec
index 0d24b258fb02650dadcf659105e77f9dc06d4402..c5473ef4892b3282b435b06bbe47cdf89aed3a34 100755
--- a/product/ERP5/spec/Coramy.spec
+++ b/product/ERP5/spec/Coramy.spec
@@ -40,6 +40,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/
 install %{name}-%{version}/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/
 install %{name}-%{version}/*.txt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Constraint
+install %{name}-%{version}/Constraint/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Constraint
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
 install %{name}-%{version}/Document/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Extensions
@@ -92,6 +93,8 @@ install %{name}-%{version}/skins/coramy_trade/*.py $RPM_BUILD_ROOT%{_libdir}/zop
 install %{name}-%{version}/skins/coramy_trade/*.pt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/coramy_trade
 install %{name}-%{version}/skins/coramy_trade/*.form $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/coramy_trade
 install %{name}-%{version}/skins/coramy_trade/*.zsql $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/coramy_trade
+install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/tests
+install %{name}-%{version}/tests/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/tests
 %clean
 rm -rf $RPM_BUILD_ROOT
 
diff --git a/product/ERP5/spec/ERP5.spec b/product/ERP5/spec/ERP5.spec
index e9dcd1cfbeb43ef4be57c844dd899f14ee6c8e2e..ba598f1b6963e21bdaa0adcba94f98b204bded22 100755
--- a/product/ERP5/spec/ERP5.spec
+++ b/product/ERP5/spec/ERP5.spec
@@ -1,9 +1,9 @@
 Name:               ERP5
 Summary:            A Zope framework to implement ERP software
-Version:            0.2
-Release:            25mdk
+Version:            0.8
+Release:            1mdk
 Group:              Development/Python
-Requires:           zope ExtFile ZSQLCatalog Photo CMFPhoto BTreeFolder2 Formulator Base18 Localizer CMFReportTool CMFMailIn ZMySQLDA PyXML python-reportlab ERP5Catalog ERP5Form ERP5Compatibility ERP5SyncML CMFCategory ERP5Type python-imaging TranslationService, python-numeric, python-psyco, python-glpk, CMFActivity
+Requires:           zope ExtFile ZSQLCatalog Photo CMFPhoto BTreeFolder2 Formulator Localizer CMFReportTool CMFMailIn ZMySQLDA PyXML python-reportlab ERP5Catalog ERP5Form ERP5SyncML CMFCategory ERP5Type python-imaging TranslationService, python-numeric, python-psyco, python-glpk, CMFActivity
 License:            GPL
 URL:                http://www.erp5.org
 Packager:           Sebastien Robin <seb@nexedi.com>
@@ -27,6 +27,12 @@ http://www.erp5.org
 rm -rf $RPM_BUILD_ROOT
 %setup -a 0
 
+#----------------------------------------------------------------------
+%post
+mkdir /var/lib/zope/Extensions
+cp %{_libdir}/zope/lib/python/Products/%{name}/Extensions/InventoryBrain.py /var/lib/zope/Extensions/
+
+
 #----------------------------------------------------------------------
 %build
 
@@ -78,28 +84,31 @@ install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5
 install %{name}-%{version}/skins/erp5_accounting/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_accounting
 install %{name}-%{version}/skins/erp5_accounting/*.pt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_accounting
 install %{name}-%{version}/skins/erp5_accounting/*.form $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_accounting
+install %{name}-%{version}/skins/erp5_accounting/*.zsql $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_accounting
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_crm
 install %{name}-%{version}/skins/erp5_crm/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_crm
 install %{name}-%{version}/skins/erp5_crm/*.dtml $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_crm
 install %{name}-%{version}/skins/erp5_crm/*.pt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_crm
 install %{name}-%{version}/skins/erp5_crm/*.form $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_crm
+install %{name}-%{version}/skins/erp5_crm/*.zsql $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_crm
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_generator
 install %{name}-%{version}/skins/erp5_generator/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_generator
+install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_test
+install %{name}-%{version}/skins/erp5_test/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_test
+install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_tmp
+install %{name}-%{version}/skins/erp5_tmp/*.form $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_tmp
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_trade
 install %{name}-%{version}/skins/erp5_trade/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_trade
 install %{name}-%{version}/skins/erp5_trade/*.pt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_trade
 install %{name}-%{version}/skins/erp5_trade/*.form $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_trade
+install %{name}-%{version}/skins/erp5_trade/*.zsql $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_trade
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/pro
 install %{name}-%{version}/skins/pro/*.dtml $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/pro
 install %{name}-%{version}/skins/pro/*.pt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/pro
 install %{name}-%{version}/skins/pro/*.props $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/pro
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/pro/images
 install %{name}-%{version}/skins/pro/images/*.png $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/pro/images
-install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_test
-install %{name}-%{version}/skins/erp5_test/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/erp5_test
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/spec
-install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/sql
-install %{name}-%{version}/sql/*.zsql $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/sql
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/TargetSolver
 install %{name}-%{version}/TargetSolver/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/TargetSolver
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/tests
@@ -120,6 +129,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/zope/lib/python/Products/%{name}/
 #----------------------------------------------------------------------
 %changelog
+* Tue Sep 01 2004 Sebastien Robin <seb@nexedi.com> 0.8-1mdk
+- New release for Mandrake 10.1
+
+* Tue Jun 15 2004 Sebastien Robin <seb@nexedi.com> 0.1-26mdk
+- Fix some sql queries
+
 * Thu Jun 10 2004 Sebastien Robin <seb@nexedi.com> 0.1-25mdk
 - New release for Mandrake 10.1
 
diff --git a/product/ERP5/spec/ERP5Catalog.spec b/product/ERP5/spec/ERP5Catalog.spec
index 0800b68fe849f7d6633eba080039fd66f0bf068d..00a523cd518388f86fea996fce63917c3fa241a4 100755
--- a/product/ERP5/spec/ERP5Catalog.spec
+++ b/product/ERP5/spec/ERP5Catalog.spec
@@ -1,7 +1,7 @@
 Name:               ERP5Catalog
 Summary:            Catalog that filter queries
-Version:            0.1
-Release:            4mdk
+Version:            0.8
+Release:            1mdk
 Group:              Development/Python
 Requires:           zope ZSQLCatalog ERP5Type
 License:            GPL
@@ -35,14 +35,25 @@ install %{name}-%{version}/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Produc
 install %{name}-%{version}/*.txt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/
 install %{name}-%{version}/*.png $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Constraint
+install %{name}-%{version}/Constraint/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Constraint
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
+install %{name}-%{version}/Document/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/dtml
 install %{name}-%{version}/dtml/*.dtml $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/dtml
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/help
 install %{name}-%{version}/help/*.stx $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/help
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
+install %{name}-%{version}/Interface/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
+install %{name}-%{version}/PropertySheet/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins
+install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/sql
+install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/sql/common_mysql
+install %{name}-%{version}/sql/common_mysql/*.zsql $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/sql/common_mysql
+install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/sql/cps3_mysql
+install %{name}-%{version}/sql/cps3_mysql/*.zsql $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/sql/cps3_mysql
+install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/sql/erp5_mysql
+install %{name}-%{version}/sql/erp5_mysql/*.zsql $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/sql/erp5_mysql
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -53,6 +64,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/zope/lib/python/Products/%{name}/
 #----------------------------------------------------------------------
 %changelog
+* Tue Sep 01 2004 Sebastien Robin <seb@nexedi.com> 0.8-1mdk
+- Final relase for Mandrake 10.1
+
+* Tue Feb 17 2004 Sebastien Robin <seb@nexedi.com> 0.1-5mdk
+- New release for Mandrake 10.1
+
 * Tue Feb 17 2004 Sebastien Robin <seb@nexedi.com> 0.1-4mdk
 - Changed permissions on files
 
diff --git a/product/ERP5/spec/ERP5Form.spec b/product/ERP5/spec/ERP5Form.spec
index eec4185101208b3d74d5d60f01cf0b5e43684ae8..ba3817e14d7dfbd47a5f091d09221b4bc6308f8a 100755
--- a/product/ERP5/spec/ERP5Form.spec
+++ b/product/ERP5/spec/ERP5Form.spec
@@ -1,7 +1,7 @@
 Name:               ERP5Form
 Summary:            Form specific to ERP5
-Version:            0.1
-Release:            4mdk
+Version:            0.8
+Release:            1mdk
 Group:              Development/Python
 Requires:           zope
 License:            GPL
@@ -39,12 +39,16 @@ install %{name}-%{version}/*.txt $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Produ
 install %{name}-%{version}/*.png $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/
 install %{name}-%{version}/*.stx $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Constraint
+install %{name}-%{version}/Constraint/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Constraint
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
+install %{name}-%{version}/Document/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/dtml
 install %{name}-%{version}/dtml/*.dtml $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/dtml
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/help
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
+install %{name}-%{version}/Interface/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
+install %{name}-%{version}/PropertySheet/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/www
 install %{name}-%{version}/www/*.png $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/www
@@ -58,6 +62,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/zope/lib/python/Products/%{name}/
 #----------------------------------------------------------------------
 %changelog
+* Tue Sep 01 2004 Sebastien Robin <seb@nexedi.com> 0.8-1mdk
+- Final relase for Mandrake 10.1
+
+* Thu Jun 10 2004 Sebastien Robin <seb@nexedi.com> 0.1-5mdk
+- New Release for Mandrake 10.1
+
 * Tue Jan 10 2004 Sebastien Robin <seb@nexedi.com> 0.1-4mdk
 - Added the dependency : ZGDChart
 
diff --git a/product/ERP5/spec/ERP5SyncML.spec b/product/ERP5/spec/ERP5SyncML.spec
index 4290a8cc18a40c6a20a79bc2c56dc5bbf13cc774..979852c8927e42be51a815d1b9312791738b9115 100755
--- a/product/ERP5/spec/ERP5SyncML.spec
+++ b/product/ERP5/spec/ERP5SyncML.spec
@@ -1,7 +1,7 @@
 Name:               ERP5SyncML
 Summary:            SyncML for ERP5
-Version:            0.1
-Release:            4mdk
+Version:            0.8
+Release:            1mdk
 Group:              Development/Python
 Requires:           zope ERP5Type
 License:            GPL
@@ -36,14 +36,21 @@ install %{name}-%{version}/*.png $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Produ
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Conduit
 install %{name}-%{version}/Conduit/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Conduit
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Constraint
+install %{name}-%{version}/Constraint/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Constraint
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
+install %{name}-%{version}/Document/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Document
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/dtml
 install %{name}-%{version}/dtml/*.dtml $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/dtml
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/help
 install %{name}-%{version}/help/*.stx $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/help
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
+install %{name}-%{version}/Interface/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
+install %{name}-%{version}/PropertySheet/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins
+install %{name}-%{version}/skins/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins
+install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/redd
+install %{name}-%{version}/skins/redd/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins/redd
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/tests
 install %{name}-%{version}/tests/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/tests
 %clean
@@ -56,8 +63,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/zope/lib/python/Products/%{name}/
 #----------------------------------------------------------------------
 %changelog
-* Tue Feb 17 2004 Sebastien Robin <seb@nexedi.com> 0.1-4mdk
-- Many updates so that it almost works now
+* Tue Sep 01 2004 Sebastien Robin <seb@nexedi.com> 0.8-1mdk
+- Final relase for Mandrake 10.1
+
+* Thu Jun 10 2004 Sebastien Robin <seb@nexedi.com> 0.1-5mdk
+- New Release For Mandkrake 10.1
 
 * Mon Sep 08 2003 Sebastien Robin <seb@nexedi.com> 0.1-3mdk
 - Changed permissions on files
diff --git a/product/ERP5/spec/ERP5Type.spec b/product/ERP5/spec/ERP5Type.spec
index af4c865e3cd0c51c59b87487564a29ed976368fb..584d1f376983a3f0d2a8d7243e91776236d35a9f 100755
--- a/product/ERP5/spec/ERP5Type.spec
+++ b/product/ERP5/spec/ERP5Type.spec
@@ -1,7 +1,7 @@
 Name:               ERP5Type
 Summary:            Base objects for ERP5
-Version:            0.1
-Release:            4mdk
+Version:            0.8
+Release:            1mdk
 Group:              Development/Python
 Requires:           zope
 License:            GPL
@@ -50,6 +50,7 @@ install %{name}-%{version}/dtml/*.dtml $RPM_BUILD_ROOT%{_libdir}/zope/lib/python
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/help
 install %{name}-%{version}/help/*.stx $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/help
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
+install %{name}-%{version}/Interface/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/Interface
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
 install %{name}-%{version}/PropertySheet/*.py $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/PropertySheet
 install -d $RPM_BUILD_ROOT%{_libdir}/zope/lib/python/Products/%{name}/skins
@@ -67,6 +68,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/zope/lib/python/Products/%{name}/
 #----------------------------------------------------------------------
 %changelog
+* Tue Sep 01 2004 Sebastien Robin <seb@nexedi.com> 0.8-1mdk
+- Final relase for Mandrake 10.1
+
+* Thu Jun 10 2004 Sebastien Robin <seb@nexedi.com> 0.1-5mdk
+- New Release For Mandkrake 10.1
+
 * Mon Feb 09 2004 Sebastien Robin <seb@nexedi.com> 0.1-4mdk
 - Updated to the last code
 
diff --git a/product/ERP5/spec/Makefile b/product/ERP5/spec/Makefile
index 5118b1cbb59809797cb3f40807dd128fcc24f976..40b3acdb113abd47f5c31eb01ced4c828ebc19a9 100755
--- a/product/ERP5/spec/Makefile
+++ b/product/ERP5/spec/Makefile
@@ -5,9 +5,9 @@
 
 RPM_PATH=/home/$(USER)/rpm
 
-all: base18-spec zsqlcatalog-spec erp5-spec coramy-spec erp5compatibility-spec \
+all: zsqlcatalog-spec erp5-spec \
 	erp5type-spec erp5syncml-spec erp5catalog-spec erp5form-spec cmfcategory-spec \
-	cmfactivity-spec construct-all
+	cmfactivity-spec construct-all list
 
 clean:
 	rm -rf /home/$(USER)/rpm/RPMS/i586/*
@@ -47,10 +47,11 @@ zsqlcatalog-spec:
 coramy-spec: 
 	build-spec Coramy
 copy: 
-	-rsync -rva $(RPM_PATH)/* /mnt/mdk/rpm/
-	-rsync -rva $(RPM_PATH)/* /mnt/mdk_cooker/rpm/
+	#-rsync -rva $(RPM_PATH)/* /mnt/mdk/rpm/
+	-rsync -rva $(RPM_PATH)/nexRPMS-mdk-10.0/* /mnt/mdk_cooker/rpm/nexRPMS-mdk-10.0/
+	-rsync -rva $(RPM_PATH)/nexRPMS-mdk-10.0/* /mnt/mdk-10.0/rpm/nexRPMS-mdk-10.0/
 construct-all:
-	rpmbuild -ba CMFCategory.spec ERP5Compatibility.spec ERP5Type.spec ERP5SyncML.spec ERP5Catalog.spec ERP5.spec ERP5Form.spec Base18.spec ZSQLCatalog.spec Coramy.spec CMFActivity.spec
+	rpmbuild -ba CMFCategory.spec ERP5Type.spec ERP5SyncML.spec ERP5Catalog.spec ERP5.spec ERP5Form.spec ZSQLCatalog.spec CMFActivity.spec
 
 # create the synthesis.hdlist.cz file
 list: list-10.0 copy
@@ -70,11 +71,13 @@ list-9.2:
 	genhdlist $(RPM_PATH)/nexRPMS-mdk-9.2/
 
 list-10.0: 
+	-mkdir $(RPM_PATH)/nexRPMS-mdk-10.0/
+	-mkdir $(RPM_PATH)/nexSRPMS-mdk-10.0/
 	-rsync -av $(RPM_PATH)/RPMS/i586/*.rpm $(RPM_PATH)/nexRPMS-mdk-10.0/
 	-rsync -av $(RPM_PATH)/RPMS/noarch/*.rpm $(RPM_PATH)/nexRPMS-mdk-10.0/
 	-rsync -av $(RPM_PATH)/SRPMS/*.rpm $(RPM_PATH)/nexSRPMS-mdk-10.0/
-	genhdlist $(RPM_PATH)/nexSRPMS-mdk-10.0/
-	genhdlist $(RPM_PATH)/nexRPMS-mdk-10.0/
+	-cd $(RPM_PATH)/nexSRPMS-mdk-10.0/ && genhdlist .
+	-cd $(RPM_PATH)/nexRPMS-mdk-10.0/ && genhdlist .
 
 # Synchronization with the nexedi server
 sync: sync-10.0
@@ -87,7 +90,7 @@ sync-9.2:
 	-rsync -rlvputz -e ssh --progress --partial --stats $(RPM_PATH)/nexRPMS-mdk-9.2/ $(USER)@smets.com:/var/www/html/nexedi.org/static/Mandrake/9.2/RPMS/
 	-rsync -rlvputz -e ssh --progress --partial --stats $(RPM_PATH)/nexSRPMS-mdk-9.2/ $(USER)@smets.com:/var/www/html/nexedi.org/static/Mandrake/9.2/SRPMS
 
-sync-9.2:
+sync-10.0:
 	-rsync -rlvputz -e ssh --progress --partial --stats $(RPM_PATH)/nexRPMS-mdk-10.0/ $(USER)@smets.com:/var/www/html/nexedi.org/static/Mandrake/10.0/RPMS/
 	-rsync -rlvputz -e ssh --progress --partial --stats $(RPM_PATH)/nexSRPMS-mdk-10.0/ $(USER)@smets.com:/var/www/html/nexedi.org/static/Mandrake/10.0/SRPMS
 
diff --git a/product/ERP5/spec/ZMySQLDA.spec b/product/ERP5/spec/ZMySQLDA.spec
index 3eb841c7c0967936ad039489a11e8a981febe032..b8b0ee74f127ff661c7bb36adf95bf7354f1af74 100755
--- a/product/ERP5/spec/ZMySQLDA.spec
+++ b/product/ERP5/spec/ZMySQLDA.spec
@@ -1,9 +1,9 @@
 Name:               ZMySQLDA
 Summary:            A Zope connector to Mysql
 Version:            2.0.9b2
-Release:            4mdk
+Release:            5mdk
 Group:              Development/Python
-Requires:           zope MySQL-python
+Requires:           zope MySQL-python MySQL-Max
 License:            GPL
 URL:                http://www.erp5.org
 Packager:           Sebastien Robin <seb@nexedi.com>
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 #----------------------------------------------------------------------
 %changelog
+* Tue Jun 15 2004 Sebastien Robin <seb@nexedi.com> 2.0.9b2-5mdk
+- Added dependency with MySQL
+
 * Wed Sep 12 2003 Sebastien Robin <seb@nexedi.com> 2.0.9b2-4mdk
 - Make now signed rpm
 
diff --git a/product/ERP5/spec/ZSQLCatalog.spec b/product/ERP5/spec/ZSQLCatalog.spec
index 415c0e3ad2a0544730c45b49b9d7e378e3ca37a9..b5a88a841c28d7439da779b26861b5bfce5ff4ff 100755
--- a/product/ERP5/spec/ZSQLCatalog.spec
+++ b/product/ERP5/spec/ZSQLCatalog.spec
@@ -1,7 +1,7 @@
 Name:               ZSQLCatalog
 Summary:            A Zope product to search the Zope database with SQL requests
-Version:            0.2.1
-Release:            7mdk
+Version:            0.8
+Release:            1mdk
 Group:              Development/Python
 Requires:           zope
 License:            GPL
@@ -55,11 +55,20 @@ rm -rf $RPM_BUILD_ROOT
 
 #----------------------------------------------------------------------
 %files
-%defattr(-,root,root,0755)
+%defattr(-,zope,zope,0755)
 %doc README.txt INSTALL.txt CREDITS.txt GPL.txt ZPL.txt
 %{_libdir}/zope/lib/python/Products/%{name}/
 #----------------------------------------------------------------------
 %changelog
+* Tue Sep 01 2004 Sebastien Robin <seb@nexedi.com> 0.8-1mdk
+- Final relase for Mandrake 10.1
+
+* Thu Jun 10 2004 Sebastien Robin <seb@nexedi.com> 0.2.1-9mdk
+- Fix user permission
+
+* Thu Jun 10 2004 Sebastien Robin <seb@nexedi.com> 0.2.1-8mdk
+- New Release For Mandkrake 10.1
+
 * Tue Feb 17 2004 Sebatien Robin <seb@nexedi.com> 0.2.1-7mdk
 - New release before Mandrake 10.0
 
diff --git a/product/ERP5/spec/build-spec-cps b/product/ERP5/spec/build-spec-cps
index f46849758cd92e9ddd1639a3d0ec4947cab8b2d1..3380b8b9cb61269a68280b29da886b374bd1f912 100755
--- a/product/ERP5/spec/build-spec-cps
+++ b/product/ERP5/spec/build-spec-cps
@@ -21,7 +21,7 @@ if [ -n "$1" ]
 then
   echo Starting Building $1
   NAME=$1
-  VERSION=3.0rc2
+  VERSION=3.0rc3
   rm -rf $CVS_PATH/$NAME-$VERSION/BTreeFolder2
   rm -rf $CVS_PATH/$NAME-$VERSION/CMFCalendar
   rm -rf $CVS_PATH/$NAME-$VERSION/CMFTopic