python-zope-processlifetime 1.0-2; python-zope-datetime 3.4.0-2

2 files changed, 23 insertions, 15 deletions

diff --git a/python-zope-datetime/F-13/python-zope-datetime.spec b/python-zope-datetime/F-13/python-zope-datetime.spec
index 2b8145d..3b95124 100644
--- a/python-zope-datetime/F-13/python-zope-datetime.spec
+++ b/python-zope-datetime/F-13/python-zope-datetime.spec
@@ -3,7 +3,7 @@
 Summary: Zope datetime utilities
 Name: python-zope-datetime
 Version: 3.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
 License: ZPLv2.1
 Group: Development/Libraries
@@ -36,6 +36,8 @@ This package provides commonly used date and time related utility functions.
 %defattr(-,root,root,-)
 # LICENSE will be included in next upstream release.
 %doc README.txt
+# Co-own %%{python_sitelib}/zope/
+%dir %{python_sitelib}/zope/
 %{python_sitelib}/zope/datetime/
 %exclude %{python_sitelib}/zope/datetime/tests/
 %{python_sitelib}/%{modname}-*.egg-info
@@ -43,6 +45,9 @@ This package provides commonly used date and time related utility functions.
 
 
 %changelog
+* Sat Sep 18 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.4.0-3
+- Co-own %%{python_sitelib}/zope/
+
 * Sat Sep 18 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.4.0-2
 - Requires: python-zope-filesystem and python-setuptools removed
 - Spec cleaned up
diff --git a/python-zope-processlifetime/F-13/python-zope-processlifetime.spec b/python-zope-processlifetime/F-13/python-zope-processlifetime.spec
index 6862296..2ff176c 100644
--- a/python-zope-processlifetime/F-13/python-zope-processlifetime.spec
+++ b/python-zope-processlifetime/F-13/python-zope-processlifetime.spec
@@ -1,14 +1,9 @@
-%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
 %global modname zope.processlifetime
-%global version 1.0
-%global release 1
 
 Summary: Zope process lifetime events
 Name: python-zope-processlifetime
-Version: %{version}
-Release: %{release}%{?dist}
+Version: 1.0
+Release: 2%{?dist}
 Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
 License: ZPLv2.1
 Group: Development/Libraries
@@ -17,8 +12,6 @@ URL: http://pypi.python.org/pypi/zope.processlifetime
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
-Requires: python-zope-filesystem
-Requires: python-zope-interface
 
 %description
 This package provides interfaces / implementations for events relative to
@@ -28,23 +21,33 @@ the lifetime of a server process (startup, database opening, etc.)
 %setup -q -n %{modname}-%{version}
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --root=$RPM_BUILD_ROOT
+%{__python} setup.py install --root=%{buildroot}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check
+%{__python} setup.py test
 
 %files
 %defattr(-,root,root,-)
+# LICENSE will be included in next upstream release
 %doc CHANGES.txt README.txt
+# Co-own %%{python_sitelib}/zope/
+%dir %{python_sitelib}/zope/
 %{python_sitelib}/zope/processlifetime/
+%exclude %{python_sitelib}/zope/processlifetime/tests.py*
 %{python_sitelib}/%{modname}-*.egg-info
 %{python_sitelib}/%{modname}-*-nspkg.pth
 
 
 %changelog
+* Sat Sep 18 2010 Robin Lee <robinlee.sysu@gmail.com> - 1.0-2
+- Spec cleaned up
+- Requires: python-zope-filesystem and python-setuptools removed
+- Exclude the tests from installation
+- Co-own %%{python_sitelib}/zope/
+- Add %%check section and run tests
+
 * Thu Jun 17 2010 Robin Lee <robinlee.sysu@gmail.com> - 1.0-1
 - Initial packaging