From 16cb01b3f93ffaebfb70bb7dd41eca9fe5af7e26 Mon Sep 17 00:00:00 2001
From: konradm <konradm@fedoraproject.org>
Date: Sat, 13 Jun 2009 08:01:49 +0000
Subject: [PATCH] - Fix file conflict with python-zope-filesystem.

---
 python-zope-testing.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 13f35fa..87ee08c 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -2,7 +2,7 @@
 
 Name:           python-zope-testing
 Version:        3.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -32,6 +32,9 @@ flexible test runner, and supports both doctest and unittest.
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# Use the __init__.py from python-zope-filesystem instead.
+rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py
+
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun 13 2009 Conrad Meyer <konrad@tylerc.org> - 3.7.3-2
+- Fix file conflict with python-zope-filesystem.
+
 * Wed Apr 22 2009 Conrad Meyer <konrad@tylerc.org> - 3.7.3-1
 - Bump to 3.7.3.