diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 3a8ce83..1661184 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -1,21 +1,16 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%endif
-
 Name:           python-zope-testing
 Version:        3.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
 URL:            http://pypi.python.org/pypi/zope.testing
 Source0:        http://pypi.python.org/packages/source/z/zope.testing/zope.testing-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
-Requires:       python-zope-filesystem
+Requires:       python-zope-exceptions
 Requires:       python-zope-interface
 
 
@@ -33,24 +28,25 @@ flexible test runner, and supports both doctest and unittest.
 
 
 %install
-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.
+# __init__.py* are not needed since .pth file is used
 rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py*
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT.txt LICENSE.txt CHANGES.txt README.txt
 %{python_sitelib}/zope/testing/
-%{python_sitelib}/zope.testing*
+%{python_sitelib}/zope.testing-*.egg-info
+%{python_sitelib}/zope.testing-*-nspkg.pth
 
 
 %changelog
+* Tue Aug 31 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.10.0-2
+- Requirement: python-zope-filesystem removed, python-zope-exceptions added
+- Spec cleaned up
+
 * Mon Aug 30 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.10.0-1
 - Update to 3.10.0
 - Rearrange documents