python-zope-componet 3.9.5;python-zope-schema 3.9.4-2

2 files changed, 30 insertions, 32 deletions

diff --git a/python-zope-component/F-13/python-zope-component.spec b/python-zope-component/F-13/python-zope-component.spec
index 765f59b..946d2e9 100644
--- a/python-zope-component/F-13/python-zope-component.spec
+++ b/python-zope-component/F-13/python-zope-component.spec
@@ -1,15 +1,10 @@
-%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.component
-%global version 3.9.4
-%global release 1
 
 Summary: Zope Component Architecture
 Name: python-zope-component
-Version: %{version}
-Release: %{release}%{?dist}
-Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.zip
+Version: 3.9.5
+Release: 1%{?dist}
+Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
 License: ZPLv2.1
 Group: Development/Libraries
 BuildArch: noarch
@@ -17,9 +12,8 @@ URL: http://pypi.python.org/pypi/zope.component
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
-Requires: python-zope-filesystem
-Requires: python-setuptools
 Requires: python-zope-interface
+# python-zope-event is noarch
 Requires: python-zope-event
 
 %description
@@ -34,22 +28,22 @@ defining, registering and looking up components.
 python setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 python setup.py install --root=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/component/*.txt
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.txt CHANGES.txt COPYRIGHT.txt
-%doc src/zope/component/*.txt
+%doc LICENSE.txt CHANGES.txt COPYRIGHT.txt README.txt
 %{python_sitelib}/zope/component/
 %{python_sitelib}/%{modname}-*.egg-info
 %{python_sitelib}/%{modname}-*-nspkg.pth
 
 
 %changelog
+* Sun Sep  5 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.9.5-1
+- Update to 3.9.5
+- Don't move documents
+- Requires: python-zope-filesystem and python-setuptools removed
+- Spec cleaned up
+
 * Wed Jun 16 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.9.4-1
 - Initial packaging
diff --git a/python-zope-schema/F-13/python-zope-schema.spec b/python-zope-schema/F-13/python-zope-schema.spec
index 38e1b0e..8b10e2a 100644
--- a/python-zope-schema/F-13/python-zope-schema.spec
+++ b/python-zope-schema/F-13/python-zope-schema.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.schema
-%global version 3.6.4
-%global release 1
 
 Summary: Zope 3 schemas
 Name: python-zope-schema
-Version: %{version}
-Release: %{release}%{?dist}
+Version: 3.6.4
+Release: 2%{?dist}
 Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
 License: ZPLv2.1
 Group: Development/Libraries
@@ -17,9 +12,13 @@ URL: http://pypi.python.org/pypi/zope.schema
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
-Requires: python-zope-filesystem
-Requires: python-setuptools
+# For tests
+BuildRequires: python-zope-testing
+BuildRequires: python-zope-interface
+BuildRequires: python-zope-event
+
 Requires: python-zope-interface
+# python-zope-event is noarch
 Requires: python-zope-event
 
 %description
@@ -32,21 +31,26 @@ This package is a zope.interface extension for defining data schemas.
 python setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --root=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{python_sitelib}/zope/schema/*.txt
+%{__python} setup.py install --root=$RPM_BUILD_ROOT
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check
+%{__python} setup.py test
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.txt CHANGES.txt COPYRIGHT.txt src/zope/schema/*.txt
+%doc LICENSE.txt CHANGES.txt COPYRIGHT.txt README.txt
 %{python_sitelib}/zope/schema/
 %{python_sitelib}/%{modname}-*.egg-info
 %{python_sitelib}/%{modname}-*-nspkg.pth
 
 
 %changelog
+* Sat Sep 11 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.6.4-2
+- Spec cleaned up
+- Requires: python-zope-filesystem and python-setuptools removed
+- Add %%check section and run tests
+- BR: python-zope-testing and runtime requirements added
+- Don't move the text files
+
 * Wed Jun 16 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.6.4-1
 - Initial packaging