[Erp5-report] r8006 - /spec/mandriva/2006.0/zope-Localizer/zope-Localizer.spec

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:38:52 2006
New Revision: 8006

URL: http://svn.erp5.org?rev=8006&view=rev
Log:
Commit zope-Localizer-1.1.0-5mdk spec files and patches

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

Modified: spec/mandriva/2006.0/zope-Localizer/zope-Localizer.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-Localizer/zope-Localizer.spec?rev=8006&r1=8005&r2=8006&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-Localizer/zope-Localizer.spec (original)
+++ spec/mandriva/2006.0/zope-Localizer/zope-Localizer.spec Mon Jun 19 17:38:52 2006
@@ -1,6 +1,6 @@
 %define product   Localizer
 %define version   1.1.0
-%define release   4
+%define release   5
 
 %define zope_minver 2.7
 
@@ -16,20 +16,11 @@
 Source:    %{product}-%{version}.tar.bz2
 Patch0:    Localizer-1.1.0-compat.patch.bz2
 Patch1:    Localizer-1.1.0-string_import.patch.bz2
-Patch2:    Localizer-1.1.0-translation_service.patch.bz2
 URL:       http://www.ikaaro.org/localizer/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
 Requires:  zope >= %{zope_minver} python-itools zope-iHotfix
-
-# (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:  Localizer
+Conflicts: Localizer
 
 #----------------------------------------------------------------------
 %description
@@ -43,7 +34,6 @@
 %setup -c
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 # Not much, eh? :-)
@@ -74,7 +64,11 @@
 
 #----------------------------------------------------------------------
 %changelog
-* Wed Jan 5 2006 Kevin Deldycke <kevin at nexedi.com> 1.1.0-4mdk
+* Wed Jan 25 2006 Kevin Deldycke <kevin at nexedi.com> 1.1.0-5mdk
+- Add "Conflicts" statement to disallow the user to install the Localizer package available in Mandriva 2006 repository.
+- Delete Translation Service patch
+
+* Wed Jan 05 2006 Kevin Deldycke <kevin at nexedi.com> 1.1.0-4mdk
 - Merge nexedi 10.2 spec file with Mandriva 2006 spec file
 
 * Wed Apr 27 2005 Yoshinori Okuji <yo at nexedi.com> 1.1.0-3mdk
@@ -98,7 +92,7 @@
 * Thu Sep 04 2003 Sebatien Robin <seb at nexedi.com> 1.0.1-3mdk
 - change in the spec file '/usr/lib' by %{_libdir}
 
-* Wed Sep 3 2003 Sebastien Robin <sebnexedi.com> 1.0.1-2mdk
+* Wed Sep 03 2003 Sebastien Robin <sebnexedi.com> 1.0.1-2mdk
 - Update spec in order to follows Mandrake Rules
 
 * Sat Oct 12 2002 Jean-Paul Smets <jp at nexedi.com> 1.0.1-1nxd