Update to 0.11 version

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5353 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/spec/CMFActivity.spec

 %define product CMFActivity
-%define version 0.10
-%define release 2
+%define version 0.11
+%define release 1
 
 %define zope_home %{_prefix}/lib/zope
 %define software_home %{zope_home}/lib/python
@@ -15,6 +15,7 @@ URL:       http://www.erp5.org
 Source0:   %{product}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
+Conflicts: CMFActivity
 Requires:  zope zope-CMF zope-TimerService
 
 #----------------------------------------------------------------------
@@ -27,13 +28,11 @@ This tools add activities for Zope objects.
 
 %build
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -54,6 +53,9 @@ fi
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Jan 26 2006 Kevin Deldycke <kevin@nexedi.com> 0.11-1mdk
+- Update to version 0.11
+
 * Mon Jan 23 2006 Kevin Deldycke <kevin@nexedi.com> 0.10-2mdk
 - CMFActivity need Timer Service Zope product
 

product/ERP5/spec/CMFCategory.spec

 %define product CMFCategory
-%define version 0.10
+%define version 0.11
 %define release 1
 
 %define zope_home %{_prefix}/lib/zope
@@ -15,6 +15,7 @@ URL:       http://www.erp5.org
 Source0:   %{product}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
+Conflicts: CMFCategory
 Requires:  zope zope-CMF
 
 #----------------------------------------------------------------------
@@ -32,13 +33,11 @@ example, the category will be named color/red, color/blue or color/green.
 
 %build
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -59,6 +58,9 @@ fi
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Jan 26 2006 Kevin Deldycke <kevin@nexedi.com> 0.11-1mdk
+- Update to version 0.11
+
 * Wed Jan 18 2006 Kevin Deldycke <kevin@nexedi.com> 0.10-1mdk
 - Update to version 0.10
 

product/ERP5/spec/ERP5.spec

 %define product ERP5
-%define version 0.10
-%define release 9
+%define version 0.11
+%define release 1
 
 %define zope_home %{_prefix}/lib/zope
 %define software_home %{zope_home}/lib/python
@@ -15,6 +15,7 @@ URL:       http://www.erp5.org
 Source0:   %{product}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
+Conflicts: ERP5
 Requires:  erp5-zope >= 2.7.8, erp5-CMFPhoto, erp5-Formulator, zope-CMFReportTool, zope-Localizer, zope-Photo, zope-ZMySQLDA, zope-BTreeFolder2, zope-CMFMailIn, zope-ERP5Catalog, zope-ERP5Form, zope-ERP5SyncML, zope-CMFCategory, zope-ERP5Type, python-numeric, python-psyco, python-glpk, zope-CMFActivity, zope-ERP5Security, zope-ERP5OOo, zope-ExtFile, zope-TimerService
 
 #----------------------------------------------------------------------
@@ -30,12 +31,10 @@ very short time.
 
 %build
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
-
 cat > README.urpmi <<EOF
 
 ERP5 need a MySQL-Max version 5.x.x server to work properly. Because this server
@@ -46,7 +45,6 @@ package and its dependancies.
 
 EOF
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -55,6 +53,7 @@ mkdir /var/lib/zope/Extensions
 mkdir /var/lib/zope/PropertySheet
 mkdir /var/lib/zope/Constraint
 ln -s %{software_home}/Products/%{product}/Extensions/zsqlbrain.py /var/lib/zope/Extensions/
+mv %{software_home}/Products/%{product}/utils/cvs_update.sh /var/lib/zope/Products/
 if [ "`%{_prefix}/bin/zopectl status`" != "daemon manager not running" ] ; then
   service zope restart
 fi
@@ -71,6 +70,10 @@ fi
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Jan 26 2006 Kevin Deldycke <kevin@nexedi.com> 0.11-1mdk
+- Update to version 0.11
+- Put the cvs_update script in the right place
+
 * Wed Jan 25 2006 Kevin Deldycke <kevin@nexedi.com> 0.10-9mdk
 - Add README.urpmi in %%doc
 

product/ERP5/spec/ERP5Catalog.spec

 %define product ERP5Catalog
-%define version 0.10
+%define version 0.11
 %define release 1
 
 %define zope_home %{_prefix}/lib/zope
@@ -15,6 +15,7 @@ URL:       http://www.erp5.org
 Source0:   %{product}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
+Conflicts: ERP5Catalog
 Requires:  erp5-zope zope-ZSQLCatalog zope-ERP5Type
 
 #----------------------------------------------------------------------
@@ -27,13 +28,11 @@ This is a Catalog that filters catalog queries. It is based on ZSQLCatalog.
 
 %build
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -54,6 +53,9 @@ fi
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Jan 26 2006 Kevin Deldycke <kevin@nexedi.com> 0.11-1mdk
+- Update to version 0.11
+
 * Wed Jan 18 2006 Kevin Deldycke <kevin@nexedi.com> 0.10-1mdk
 - Update to version 0.10
 

product/ERP5/spec/ERP5Form.spec

 %define product ERP5Form
-%define version 0.10
+%define version 0.11
 %define release 1
 
 %define zope_home %{_prefix}/lib/zope
@@ -15,6 +15,7 @@ URL:       http://www.erp5.org
 Source0:   %{product}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
+Conflicts: ERP5Form
 Requires:  erp5-zope erp5-Formulator
 
 #----------------------------------------------------------------------
@@ -31,13 +32,11 @@ ERP5Type, ERP5Form defines a fast rapid application environment.
 
 %build
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -58,6 +57,9 @@ fi
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Jan 26 2006 Kevin Deldycke <kevin@nexedi.com> 0.11-1mdk
+- Update to version 0.11
+
 * Wed Jan 18 2006 Kevin Deldycke <kevin@nexedi.com> 0.10-1mdk
 - Update to version 0.10
 

product/ERP5/spec/ERP5OOo.spec

 %define product ERP5OOo
-%define version 0.10
+%define version 0.11
 %define release 1
 
 %define zope_home %{_prefix}/lib/zope
@@ -15,6 +15,7 @@ URL:       http://www.erp5.org
 Source0:   %{product}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
+Conflicts: ERP5OOo
 Requires:  erp5-zope
 
 #----------------------------------------------------------------------
@@ -27,13 +28,11 @@ General purpose tools to parse and handle OpenOffice v1.x documents in ERP5.
 
 %build
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -54,6 +53,9 @@ fi
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Jan 26 2006 Kevin Deldycke <kevin@nexedi.com> 0.11-1mdk
+- Update to version 0.11
+
 * Wed Jan 18 2006 Kevin Deldycke <kevin@nexedi.com> 0.10-1mdk
 - Update to version 0.10
 

product/ERP5/spec/ERP5Security.spec

 %define product ERP5Security
-%define version 0.10
+%define version 0.11
 %define release 1
 
 %define zope_home %{_prefix}/lib/zope
@@ -15,6 +15,7 @@ URL:       http://www.erp5.org
 Source0:   %{product}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
+Conflicts: ERP5Security
 Requires:  erp5-zope zope-PluggableAuthService
 
 #----------------------------------------------------------------------
@@ -29,13 +30,11 @@ ERP5.
 
 %build
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -56,6 +55,9 @@ fi
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Jan 26 2006 Kevin Deldycke <kevin@nexedi.com> 0.11-1mdk
+- Update to version 0.11
+
 * Wed Jan 18 2006 Kevin Deldycke <kevin@nexedi.com> 0.10-1mdk
 - Update to version 0.10
 

product/ERP5/spec/ERP5SyncML.spec

 %define product ERP5SyncML
-%define version 0.10
+%define version 0.11
 %define release 1
 
 %define zope_home %{_prefix}/lib/zope
@@ -15,6 +15,7 @@ URL:       http://www.erp5.org
 Source0:   %{product}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
+Conflicts: ERP5SyncML
 Requires:  erp5-zope zope-ERP5Type erp5diff
 
 #----------------------------------------------------------------------
@@ -29,13 +30,11 @@ the Rapid Application Developpement feature used in ERP5.
 
 %build
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -56,6 +55,9 @@ fi
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Jan 26 2006 Kevin Deldycke <kevin@nexedi.com> 0.11-1mdk
+- Update to version 0.11
+
 * Wed Jan 18 2006 Kevin Deldycke <kevin@nexedi.com> 0.10-1mdk
 - Update to version 0.10
 

product/ERP5/spec/ERP5Type.spec

 %define product ERP5Type
-%define version 0.10
-%define release 2
+%define version 0.11
+%define release 1
 
 %define zope_home %{_prefix}/lib/zope
 %define software_home %{zope_home}/lib/python
@@ -15,6 +15,7 @@ URL:       http://www.erp5.org
 Source0:   %{product}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
+Conflicts: ERP5Type
 Requires:  erp5-zope
 
 #----------------------------------------------------------------------
@@ -29,13 +30,11 @@ the Rapid Application Developpement feature used in ERP5.
 
 %build
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -57,6 +56,9 @@ fi
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Jan 26 2006 Kevin Deldycke <kevin@nexedi.com> 0.11-1mdk
+- Update to version 0.11
+
 * Thu Jan 19 2006 Kevin Deldycke <kevin@nexedi.com> 0.10-2mdk
 - Add missing custom post-command
 

product/ERP5/spec/ZSQLCatalog.spec

 %define product ZSQLCatalog
-%define version 0.10
-%define release 3
+%define version 0.11
+%define release 1
 
 %define zope_home %{_prefix}/lib/zope
 %define software_home %{zope_home}/lib/python
@@ -15,6 +15,7 @@ URL:       http://www.erp5.org
 Source0:   %{product}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
+Conflicts: ZSQLCatalog
 Requires:  zope
 
 #----------------------------------------------------------------------
@@ -29,13 +30,11 @@ which can be connected to any SQL relationnal database through ZSQLMethods.
 
 %build
 
-
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
 
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -58,6 +57,9 @@ fi
 
 #----------------------------------------------------------------------
 %changelog
+* Thu Jan 26 2006 Kevin Deldycke <kevin@nexedi.com> 0.11-1mdk
+- Update to version 0.11
+
 * Mon Jan 23 2006 Kevin Deldycke <kevin@nexedi.com> 0.10-3mdk
 - Fix bad symlink