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

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:25:29 2006
New Revision: 7870

URL: http://svn.erp5.org?rev=7870&view=rev
Log:
Commit erp5-zope-2.7.8.final-4mdk 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=7870&r1=7869&r2=7870&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:29 2006
@@ -1,8 +1,8 @@
 %define realVersion 2.7.8-final
-%define name zope
-%define release 3
-
-%define version %(echo %{realVersion} | sed -e's/-/./g')
+%define name        zope
+%define release     4
+
+%define version  %(echo %{realVersion} | sed -e's/-/./g')
 %define sVersion %(echo %{realVersion} | cut -d- -f1)
 
 
@@ -19,25 +19,24 @@
 Source3:       README.install.urpmi.zope
 Patch0:        Zope-2.7.2-rc1-aq_dynamic.patch.bz2
 Requires:      python >= 2.3.3
-BuildRequires: python-devel >= 2.3.3
+BuildRequires: libpython-devel >= 2.3.3
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
 Epoch:         1
-
-#Conflicts:     zope
+Conflicts:     python-zope-interface
 Provides:      zope = %{?Epoch:%Epoch-}%{version}
 
 
-%define python /usr/bin/python
-%define zopehome /usr/lib/zope
-%define softwarehome %{zopehome}/lib/python
-%define instancehome /var/lib/zope
-%define clienthome %{instancehome}/data
-%define statehome /var/run/zope
-%define loghome /var/log/zope
-%define configfile /etc/zope.conf
-%define zopectl /usr/bin/zopectl
-%define runzope /usr/bin/runzope
-%define zopeuser zope
+%define python        /usr/bin/python
+%define zopehome      /usr/lib/zope
+%define softwarehome  %{zopehome}/lib/python
+%define instancehome  /var/lib/zope
+%define clienthome    %{instancehome}/data
+%define statehome     /var/run/zope
+%define loghome       /var/log/zope
+%define configfile    /etc/zope.conf
+%define zopectl       /usr/bin/zopectl
+%define runzope       /usr/bin/runzope
+%define zopeuser      zope
 
 %description
 Zope is an open source application server for building content managements,
@@ -231,6 +230,10 @@
 ##############################################################################
 
 %changelog
+* 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
+
 * Tue Jan 24 2006 Kevin Deldycke <kevin at nexedi.com> 2.7.8-3nxd
 - Doc package doesn't requires zope
 - Add Epoch tag