python-zope-filerepresentation 3.6.0-2; python-zope-i18nmessageid 3.5.3

2 files changed, 28 insertions, 31 deletions

diff --git a/python-zope-filerepresentation/F-13/python-zope-filerepresentation.spec b/python-zope-filerepresentation/F-13/python-zope-filerepresentation.spec
index c028095..2815c37 100644
--- a/python-zope-filerepresentation/F-13/python-zope-filerepresentation.spec
+++ b/python-zope-filerepresentation/F-13/python-zope-filerepresentation.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.filerepresentation
-%global version 3.6.0
-%global release 1
 
 Summary: File-system Representation Interfaces
 Name: python-zope-filerepresentation
-Version: %{version}
-Release: %{release}%{?dist}
+Version: 3.6.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.filerepresentation
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
-Requires: python-zope-filesystem
-Requires: python-setuptools
 Requires: python-zope-interface
 
 %description
@@ -30,23 +23,26 @@ WebDAV.
 %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
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --root=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc CHANGES.txt README.txt
+# Co-own %%{python_sitelib}/zope/
+%dir %{python_sitelib}/zope/
 %{python_sitelib}/zope/filerepresentation/
 %{python_sitelib}/%{modname}-*.egg-info
 %{python_sitelib}/%{modname}-*-nspkg.pth
 
 
 %changelog
+* Tue Sep 14 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.6.0-2
+- Requires: python-zope-filesystem and python-setuptools removed
+- Co-own %%{python_sitelib}/zope/
+- Spec cleaned up
+
 * Wed Jun 16 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.6.0-1
 - Initial packaging
diff --git a/python-zope-i18nmessageid/F-13/python-zope-i18nmessageid.spec b/python-zope-i18nmessageid/F-13/python-zope-i18nmessageid.spec
index c98546a..620a685 100644
--- a/python-zope-i18nmessageid/F-13/python-zope-i18nmessageid.spec
+++ b/python-zope-i18nmessageid/F-13/python-zope-i18nmessageid.spec
@@ -1,23 +1,16 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
 %global modname zope.i18nmessageid
-%global version 3.5.2
-%global release 2
 
 Summary: Message Identifiers for internationalization
 Name: python-zope-i18nmessageid
-Version: %{version}
-Release: %{release}%{?dist}
-Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.zip
+Version: 3.5.3
+Release: 1%{?dist}
+Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
 License: ZPLv2.1
 Group: Development/Libraries
 URL: http://pypi.python.org/pypi/zope.i18nmessageid
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
-Requires: python-zope-filesystem
-Requires: python-setuptools
 
 %description
 This module provides message identifiers for internationalization.
@@ -26,26 +19,34 @@ This module provides message identifiers for internationalization.
 %setup -q -n %{modname}-%{version}
 
 %build
-env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
+env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --root=$RPM_BUILD_ROOT
+%{__python} setup.py install --root=$RPM_BUILD_ROOT
 # remove contained source file(s)
 find $RPM_BUILD_ROOT -name '*.c' -type f -print0 | xargs -0 rm -fv
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check
+%{__python} setup.py test
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES.txt README.txt
+%doc CHANGES.txt README.txt COPYRIGHT.txt LICENSE.txt
+# Co-own %%{python_sitearch}/zope/
+%dir %{python_sitearch}/zope/
 %{python_sitearch}/zope/i18nmessageid/
 %{python_sitearch}/%{modname}-*.egg-info
 %{python_sitearch}/%{modname}-*-nspkg.pth
 
 
 %changelog
+* Wed Sep 15 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.5.3-1
+- Update to 3.5.3
+- Requires: python-zope-filesystem and python-setuptools removed
+- Add %%check section and run tests
+- Co-own %%{python_sitearch}/zope/
+- Spec cleaned up
+
 * Tue Jun 22 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.5.2-2
 - don't move the text files