[Erp5-report] r7915 - /spec/mandriva/2006.0/zope-CMFReportTool/zope-CMFReportTool.spec

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:29:50 2006
New Revision: 7915

URL: http://svn.erp5.org?rev=7915&view=rev
Log:
Commit zope-CMFReportTool-0.1.1.20060206-1mdk spec files and patches

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

Modified: spec/mandriva/2006.0/zope-CMFReportTool/zope-CMFReportTool.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-CMFReportTool/zope-CMFReportTool.spec?rev=7915&r1=7914&r2=7915&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-CMFReportTool/zope-CMFReportTool.spec (original)
+++ spec/mandriva/2006.0/zope-CMFReportTool/zope-CMFReportTool.spec Mon Jun 19 17:29:50 2006
@@ -1,6 +1,6 @@
 %define product   CMFReportTool
-%define version   0.1.1.20060105
-%define release   3
+%define version   0.1.1.20060206
+%define release   1
 
 %define zope_minver 2.6
 
@@ -15,22 +15,10 @@
 License:   GPL
 URL:       http://www.zope.org/Members/jack-e/CMFReportTool/
 Source:    %{product}-%{version}.tar.bz2
-# Source:    http://svn.plone.org/svn/collective/CMFReportTool/
-# -> svn co http://svn.plone.org/svn/collective/CMFReportTool/trunk/
 BuildRoot: %{_tmppath}/%{name}-%{version}-rootdir
 Buildarch: noarch
 Requires:  zope >= %{zope_minver} zope-CMF python-reportlab python-imaging python-pyxml
-
-# Same problem as the Localizer one:
-# (kevin) This "Provides:" statement don't resolve the conflit of pre-existing
-# Localizer package in Mandriva 2006 repository. When you type "urpmi Localizer",
-# nothing is prompt to ask you which version of Localizer you want to install
-# (the mandriva one or the nexedi one): the mandriva version is automatically
-# selected. To obtain the Nexedi's one, you have to type "urpmi zope-Localizer".
-# The solution could be to add a "Provides:  Localizer" statement in Mandriva
-# Spec file.
-Provides:  CMFReportTool
-
+Conflicts: CMFReportTool
 
 #----------------------------------------------------------------------
 %description
@@ -43,7 +31,7 @@
 %setup -c
 
 %build
-#----------------------------------------------------------------------
+
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
@@ -66,9 +54,12 @@
 %defattr(0644, zope, zope, 0755)
 %{software_home}/Products/*
 
-
 #----------------------------------------------------------------------
 %changelog
+* Mon Feb 06 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.1.20060206-1mdk
+- Update to latest SVN trunk
+- Add conflicts statement to prevent the installation of old CMFReportTool
+
 * Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 0.1.1.20060105-3mdk
 - Give ownership to zope