[Erp5-report] r7871 - /spec/mandriva/2006.0/erp5-zope/erp5-zope.spec

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:25:37 2006
New Revision: 7871

URL: http://svn.erp5.org?rev=7871&view=rev
Log:
Commit erp5-zope-2.7.8.final-5mdk spec files and patches

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

Modified: spec/mandriva/2006.0/erp5-zope/erp5-zope.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/erp5-zope/erp5-zope.spec?rev=7871&r1=7870&r2=7871&view=diff
==============================================================================
--- spec/mandriva/2006.0/erp5-zope/erp5-zope.spec (original)
+++ spec/mandriva/2006.0/erp5-zope/erp5-zope.spec Mon Jun 19 17:25:37 2006
@@ -1,6 +1,6 @@
 %define realVersion 2.7.8-final
 %define name        zope
-%define release     4
+%define release     5
 
 %define version  %(echo %{realVersion} | sed -e's/-/./g')
 %define sVersion %(echo %{realVersion} | cut -d- -f1)
@@ -22,7 +22,6 @@
 BuildRequires: libpython-devel >= 2.3.3
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 Epoch:         1
-Conflicts:     python-zope-interface
 Provides:      zope = %{?Epoch:%Epoch-}%{version}
 
 
@@ -230,6 +229,9 @@
 ##############################################################################
 
 %changelog
+* Fri Apr 14 2006 Kevin Deldycke <kevin at nexedi.com> 2.7.8-5nxd
+- Remove conflict with "python-zope-interface" which was too violent
+
 * Fri Apr 14 2006 Kevin Deldycke <kevin at nexedi.com> 2.7.8-4nxd
 - Add "python-zope-interface" as a conflict package
 - Required package for build is libpython-devel not python-devel