[Erp5-report] r7866 - /spec/mandriva/2006.0/erp5-Formulator/erp5-Formulator.spec

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:25:05 2006
New Revision: 7866

URL: http://svn.erp5.org?rev=7866&view=rev
Log:
Commit erp5-Formulator-1.6.1-5mdk spec files and patches

Modified:
    spec/mandriva/2006.0/erp5-Formulator/erp5-Formulator.spec

Modified: spec/mandriva/2006.0/erp5-Formulator/erp5-Formulator.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/erp5-Formulator/erp5-Formulator.spec?rev=7866&r1=7865&r2=7866&view=diff
==============================================================================
--- spec/mandriva/2006.0/erp5-Formulator/erp5-Formulator.spec (original)
+++ spec/mandriva/2006.0/erp5-Formulator/erp5-Formulator.spec Mon Jun 19 17:25:05 2006
@@ -1,6 +1,6 @@
 %define product   Formulator
 %define version   1.6.1
-%define release   4
+%define release   5
 
 %define zope_home %{_prefix}/lib/zope
 %define software_home %{zope_home}/lib/python
@@ -17,7 +17,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 Requires:  zope
-Provides:  Formulator
+Conflicts: zope-Formulator
 
 
 %description
@@ -61,8 +61,12 @@
 
 #----------------------------------------------------------------------
 %changelog
-* Wed Jan 5 2006 Kevin Deldycke <kevin at nexedi.com> 1.6.1-4mdk
-  - Rewrite spec file based on the one written by Gaetan Lehmann for Mandriva 2006
+* Tue Jan 24 2006 Kevin Deldycke <kevin at nexedi.com> 1.6.1-5mdk
+- Add "Conflicts:" statement
+- Delete "Provides:" statement
+
+* Wed Jan 05 2006 Kevin Deldycke <kevin at nexedi.com> 1.6.1-4mdk
+- Rewrite spec file based on the one written by Gaetan Lehmann for Mandriva 2006
 
 * Thu Jan 22 2004 Sebastien Robin <seb at nexedi.com> 1.6.1-3mdk
 - small error on the last patch
@@ -90,10 +94,10 @@
 * Wed Jun 11 2003 Sebastien Robin <seb at nexedi.com> 1.3.1-6nxd
 - New patch made by me in order to get an xml ordered
 
-* Thu Jun 3 2003 Sebastien Robin <seb at nexedi.com> 1.3.1-5nxd
+* Thu Jun 03 2003 Sebastien Robin <seb at nexedi.com> 1.3.1-5nxd
 - New patch again in order to apply a script on a line of a listbox (with the cell value)
 
-* Thu Jun 3 2003 Sebastien Robin <seb at nexedi.com> 1.3.1-4nxd
+* Thu Jun 03 2003 Sebastien Robin <seb at nexedi.com> 1.3.1-4nxd
 - New patch in order to apply a script on a line of a listbox (with the cell value)
 
 * Tue May 13 2003 Sebastien Robin <seb at nexedi.com> 1.3.1-3nxd
@@ -101,12 +105,10 @@
 
 * Wed Mar 26 2003 Sebastien Robin <seb at nexedi.com> 1.3.1-1nxd
 - Update to release 1.3.1 of the formulator
-- Added patch made by Jean-Paul Smets <jp at nexedi.com> wich allows
-to use a list of keys.
+- Added patch made by Jean-Paul Smets <jp at nexedi.com> wich allows to use a list of keys.
 
-* Mon Nov 4 2002 Sebastien Robin <seb at nexedi.com> 1.2.0-2nxd
+* Mon Nov 04 2002 Sebastien Robin <seb at nexedi.com> 1.2.0-2nxd
 - Added patch in order to dynamically change the name
 
-* Mon Nov 4 2002 Jean-Paul Smets <jp at nexedi.com> 1.2.0-1nxd
+* Mon Nov 04 2002 Jean-Paul Smets <jp at nexedi.com> 1.2.0-1nxd
 - Initial release
-