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

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:25:24 2006
New Revision: 7869

URL: http://svn.erp5.org?rev=7869&view=rev
Log:
Commit erp5-zope-2.7.8.final-3mdk 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=7869&r1=7868&r2=7869&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:24 2006
@@ -1,6 +1,6 @@
 %define realVersion 2.7.8-final
 %define name zope
-%define release 2
+%define release 3
 
 %define version %(echo %{realVersion} | sed -e's/-/./g')
 %define sVersion %(echo %{realVersion} | cut -d- -f1)
@@ -21,7 +21,11 @@
 Requires:      python >= 2.3.3
 BuildRequires: python-devel >= 2.3.3
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
-Provides:      zope
+Epoch:         1
+
+#Conflicts:     zope
+Provides:      zope = %{?Epoch:%Epoch-}%{version}
+
 
 %define python /usr/bin/python
 %define zopehome /usr/lib/zope
@@ -211,7 +215,6 @@
 
 %package docs
 Summary:    Documentation for the Zope application server
-Requires:   zope = %{version}
 Group:      Networking/WWW
 
 %description docs
@@ -228,71 +231,77 @@
 ##############################################################################
 
 %changelog
+* Tue Jan 24 2006 Kevin Deldycke <kevin at nexedi.com> 2.7.8-3nxd
+- Doc package doesn't requires zope
+- Add Epoch tag
+- Add "Conflicts: zope"
+- Add version to "Provides" statement
+
 * Wed Jan 5 2006 Kevin Deldycke <kevin at nexedi.com> 2.7.8-2nxd
-  - Rewrite spec file based on the one written by Gaetan Lehmann for the zope-2.7.7 release for Mandriva 2006
-  - Add 'erp5' prefix to package name
-  - Add README.install.urpmi.zope
-  - Remove default admin user
+- Rewrite spec file based on the one written by Gaetan Lehmann for the zope-2.7.7 release for Mandriva 2006
+- Add 'erp5' prefix to package name
+- Add README.install.urpmi.zope
+- Remove default admin user
 
 * Fri Oct 28 2005 Yoshinori Okuji <yo at nexedi.com> 2.7.8-1nxd
-  - New upstream release
+- New upstream release
 
 * Wed Oct 12 2005 Yoshinori Okuji <yo at nexedi.com> 2.7.7b1-1nxd
-  - New upstream release
+- New upstream release
 
 * Sun Apr 24 2005 Yoshinori Okuji <yo at nexedi.com> 2.7.6b2-2nxd
-  - Rebuild against Python 2.4
+- Rebuild against Python 2.4
 
 * Thu Apr 21 2005 Yoshinori Okuji <yo at nexedi.com> 2.7.6b2-1nxd
-  - Bump to Zope 2.7.6b2
+- Bump to Zope 2.7.6b2
 
 * Thu Feb 3 2005 Yoshinori Okuji <yo at nexedi.com> 2.7.2rc1-3nxd
-  - The source tarball was not bzip2'ed even though the suffix was bz2
+- The source tarball was not bzip2'ed even though the suffix was bz2
 
 * Tue Feb 1 2005 Yoshinori Okuji <yo at nexedi.com> 2.7.2rc1-2nxd
-  - Fix the method bounding in _aq_dynamic
+- Fix the method bounding in _aq_dynamic
 
 * Mon Aug 2 2004 Yoshinori Okuji <yo at nexedi.com> 2.7.2rc1-1nxd
-  - Bump to 2.7.2rc1
-  - Patch Acquistion to support _aq_dynamic
+- Bump to 2.7.2rc1
+- Patch Acquistion to support _aq_dynamic
 
 * Sat Feb 07 2004 Stéfane Fermigier <sf at nuxeo.com> 2.7.0rc2-1mdk
-  - Bump to Zope 2.7.0rc2
+- Bump to Zope 2.7.0rc2
 
 * Sun Jan 11 2004 Stéfane Fermigier <sf at nuxeo.com> 2.7.0b4-1mdk
-  - Bump to Zope 2.7.0b4
+- Bump to Zope 2.7.0b4
 
 * Sun Sep 14 2003 Stéfane Fermigier <sf at nuxeo.com> 2.7.0b2-1pyp
-  - Update to Zope 2.7.0b2
+- Update to Zope 2.7.0b2
 
 * Fri Aug 15 2003 Stéfane Fermigier <sf at nuxeo.com> 2.7.0b1-3pyp
-  - Update for Python 2.3
+- Update for Python 2.3
 
 * Sat Aug 9 2003 Stéfane Fermigier <sf at nuxeo.com> 2.7.0b1-2pyp
-  - Added copyright notice
-  - Compile to .pyc as well as to .pyo
+- Added copyright notice
+- Compile to .pyc as well as to .pyo
 
 * Sat Jul 26 2003 Stéfane Fermigier <sf at nuxeo.com> 2.7.0b1-1mdk
-  - Update to Zope 2.7.0b1
-  - Merged stuff from the Zope.org RPM
+- Update to Zope 2.7.0b1
+- Merged stuff from the Zope.org RPM
 
 * Sat May 3 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-6mdk
-  - Moved python stuff from /usr/lib/zope to /usr/lib/zope/lib/python
+- Moved python stuff from /usr/lib/zope to /usr/lib/zope/lib/python
 
 * Mon Mar 24 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-5mdk
-  - Moved python stuff from /usr/lib/zope to /usr/lib/zope/lib/python
+- Moved python stuff from /usr/lib/zope to /usr/lib/zope/lib/python
 
 * Tue Feb 25 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-4mdk
-  - changes by Frederic Lepied
-  - fixed dependency problem between zope-docs and zope
-  - removed unused directive
+- changes by Frederic Lepied
+- fixed dependency problem between zope-docs and zope
+- removed unused directive
 
 * Sun Feb 23 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-3mdk
-  - fix bugs
+- fix bugs
 
 * Sat Feb 22 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-2mdk
-  - dont ship tests
-  - separate docs package, including the Zope Book.
+- dont ship tests
+- separate docs package, including the Zope Book.
 
 * Sat Feb 22 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-1mdk
-  First release starting from PLD RPM.
+- First release starting from PLD RPM.