[Erp5-report] r8015 - /spec/mandriva/2006.0/zope-PluggableAuthService/

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:39:47 2006
New Revision: 8015

URL: http://svn.erp5.org?rev=8015&view=rev
Log:
Commit zope-PluggableAuthService-1.1b2-5mdk spec files and patches

Added:
    spec/mandriva/2006.0/zope-PluggableAuthService/PluggableAuthService-zope_interface.patch
Modified:
    spec/mandriva/2006.0/zope-PluggableAuthService/zope-PluggableAuthService.spec

Added: spec/mandriva/2006.0/zope-PluggableAuthService/PluggableAuthService-zope_interface.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-PluggableAuthService/PluggableAuthService-zope_interface.patch?rev=8015&view=auto
==============================================================================
--- spec/mandriva/2006.0/zope-PluggableAuthService/PluggableAuthService-zope_interface.patch (added)
+++ spec/mandriva/2006.0/zope-PluggableAuthService/PluggableAuthService-zope_interface.patch Mon Jun 19 17:39:47 2006
@@ -1,0 +1,62 @@
+Only in ./: PluggableAuthService.pyc
+Only in ./: PropertiedUser.pyc
+Only in ./: UserPropertySheet.pyc
+Only in ./: __init__.pyc
+Only in ./interfaces: __init__.pyc
+Only in ./interfaces: authservice.pyc
+diff -ur /home/yo/tmp/PluggableAuthService/interfaces/plugins.py ./interfaces/plugins.py
+--- /home/yo/tmp/PluggableAuthService/interfaces/plugins.py 2005-07-06 20:48:02.000000000 +0200
++++ ./interfaces/plugins.py 2006-03-22 18:10:12.307937023 +0100
+@@ -19,6 +19,7 @@
+
+ try:
+     from zope.interface import Interface
++    from Products.Five.bridge import fromZ2Interface
+ except ImportError:
+     from Interface import Interface
+
+Only in ./interfaces: plugins.pyc
+Only in ./interfaces: propertysheets.pyc
+Only in ./: permissions.pyc
+Only in ./plugins: BasePlugin.pyc
+Only in ./plugins: CookieAuthHelper.pyc
+Only in ./plugins: DelegatingMultiPlugin.pyc
+Only in ./plugins: DomainAuthHelper.pyc
+Only in ./plugins: DynamicGroupsPlugin.pyc
+Only in ./plugins: HTTPBasicAuthHelper.pyc
+Only in ./plugins: InlineAuthHelper.pyc
+Only in ./plugins: LocalRolePlugin.pyc
+Only in ./plugins: RecursiveGroupsPlugin.pyc
+Only in ./plugins: ScriptablePlugin.pyc
+Only in ./plugins: SearchPrincipalsPlugin.pyc
+Only in ./plugins: SessionAuthHelper.pyc
+Only in ./plugins: ZODBGroupManager.pyc
+Only in ./plugins: ZODBRoleManager.pyc
+Only in ./plugins: ZODBUserManager.pyc
+Only in ./plugins: __init__.pyc
+diff -ur /home/yo/tmp/PluggableAuthService/utils.py ./utils.py
+--- /home/yo/tmp/PluggableAuthService/utils.py  2005-07-06 20:47:07.000000000 +0200
++++ ./utils.py  2006-03-22 18:08:02.873411921 +0100
+@@ -19,18 +19,21 @@
+
+ try:
+     from zope.interface import providedBy
++    from Products.Five.bridge import fromZ2Interface
+ except ImportError:
+     def providedBy(obj):
+         return obj.__implements__
+
+ try:
+     from zope.interface import implementedBy
++    from Products.Five.bridge import fromZ2Interface
+ except ImportError:
+     def implementedBy(klass):
+         return klass.__implements__
+
+ try:
+     from zope import interface
++    from Products.Five.bridge import fromZ2Interface
+ except ImportError:
+     def directlyProvides(obj, *interfaces):
+         obj.__implements__ = tuple( interfaces )
+Only in ./: utils.pyc

Modified: spec/mandriva/2006.0/zope-PluggableAuthService/zope-PluggableAuthService.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-PluggableAuthService/zope-PluggableAuthService.spec?rev=8015&r1=8014&r2=8015&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-PluggableAuthService/zope-PluggableAuthService.spec (original)
+++ spec/mandriva/2006.0/zope-PluggableAuthService/zope-PluggableAuthService.spec Mon Jun 19 17:39:47 2006
@@ -1,6 +1,6 @@
 %define product PluggableAuthService
 %define version 1.1b2
-%define release 4
+%define release 5
 
 %define zope_home %{_prefix}/lib/zope
 %define software_home %{zope_home}/lib/python
@@ -13,6 +13,7 @@
 Group:     System/Servers
 URL:       http://www.zope.org/Members/urbanape/PluggableAuthService
 Source0:   %{product}-%{version}.tar.bz2
+Patch0:    PluggableAuthService-zope_interface.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
 Requires:  zope zope-PluginRegistry
@@ -34,7 +35,7 @@
 %build
 
 %install
-%{__rm} -rf %{buildroot}
+%{__rm} -rf  %{buildroot}
 %{__mkdir_p} %{buildroot}/%{software_home}/Products
 %{__cp} -a * %{buildroot}%{software_home}/Products/
 
@@ -57,6 +58,9 @@
 
 #----------------------------------------------------------------------
 %changelog
+* Fri Apr 14 2006 Kevin Deldycke <kevin at nexedi.com> 1.1b2-5mdk
+- Add a patch to not force the import of Five
+
 * Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 1.1b2-4mdk
 - Give ownership to zope