[Erp5-report] r7863 - /spec/mandriva/2006.0/erp5-CMFPhoto/erp5-CMFPhoto.spec

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:24:45 2006
New Revision: 7863

URL: http://svn.erp5.org?rev=7863&view=rev
Log:
Commit erp5-CMFPhoto-1.2.3-6mdk spec files and patches

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

Modified: spec/mandriva/2006.0/erp5-CMFPhoto/erp5-CMFPhoto.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/erp5-CMFPhoto/erp5-CMFPhoto.spec?rev=7863&r1=7862&r2=7863&view=diff
==============================================================================
--- spec/mandriva/2006.0/erp5-CMFPhoto/erp5-CMFPhoto.spec (original)
+++ spec/mandriva/2006.0/erp5-CMFPhoto/erp5-CMFPhoto.spec Mon Jun 19 17:24:45 2006
@@ -1,6 +1,6 @@
 %define product CMFPhoto
 %define version 1.2.3
-%define release 5
+%define release 6
 
 %define zope_home %{_prefix}/lib/zope
 %define software_home %{zope_home}/lib/python
@@ -15,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
 Requires:  zope zope-CMF zope-Photo
-Provides:  CMFPhoto
+Conflicts: zope-CMFPhoto
 
 %description
 Extremely useful Zope Product for representing a resizable image (photo) in a
@@ -60,22 +60,25 @@
 %{software_home}/Products/*
 
 
-
 #----------------------------------------------------------------------
 %changelog
-* Wed Jan 5 2006 Kevin Deldycke <kevin at nexedi.com> 1.2.3-5mdk
-  - Rewrite spec file based on the one written by Gaetan Lehmann for the zope-CMFPhoto release for Mandriva 2006
-  - Add 'erp5' prefix to package name
-  - Update the description
+* Tue Jan 24 2006 Kevin Deldycke <kevin at nexedi.com> 1.2.3-6mdk
+- Add "Conflicts:" statement
+- Delete "Provides:" statement
 
-* Thu Sep 4 2003 Sebatien Robin <seb at nexedi.com> 1.2.3-4mdk
+* Wed Jan 05 2006 Kevin Deldycke <kevin at nexedi.com> 1.2.3-5mdk
+- Rewrite spec file based on the one written by Gaetan Lehmann for the zope-CMFPhoto release for Mandriva 2006
+- Add 'erp5' prefix to package name
+- Update the description
+
+* Thu Sep 04 2003 Sebatien Robin <seb at nexedi.com> 1.2.3-4mdk
 - Change in the spec file '/usr/lib' by %{_libdir}
 
-* Wed Sep 3 2003 Sébastien Robin <seb at nexedi.com> 1.2.3-3mdk
+* Wed Sep 03 2003 Sébastien Robin <seb at nexedi.com> 1.2.3-3mdk
 - Update this rpm in order to follows Mandrake rules
 
 * Wed Apr 25 2003 Sébastien Robin <seb at nexedi.com> 1.2.3-2nxd
 - Clean the spec file
 
-* Mon Feb 3 2003 Jean-Paul Smets <jp at nexedi.com> 1.2.3-1nxd
+* Mon Feb 03 2003 Jean-Paul Smets <jp at nexedi.com> 1.2.3-1nxd
 - Initial release