From 90024d39cddd816f2dc8f34bcd4038eefdbc1819 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Oct 04 2010 04:40:37 +0000 Subject: - Obsoletes python-zope-filesystem --- diff --git a/python-zope-interface.spec b/python-zope-interface.spec index 2f9a45a..dbd6b7a 100644 --- a/python-zope-interface.spec +++ b/python-zope-interface.spec @@ -4,7 +4,7 @@ Name: python-zope-interface Version: 3.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Zope 3 Interface Infrastructure Group: Development/Libraries License: ZPLv2.1 @@ -12,6 +12,8 @@ URL: http://pypi.python.org/pypi/zope.interface Source0: http://pypi.python.org/packages/source/z/zope.interface/zope.interface-%{version}.tar.gz BuildRequires: python2-devel BuildRequires: python-setuptools +# since F14 +Obsoletes: python-zope-filesystem <= 1-8 %description Interfaces are a mechanism for labeling objects as conforming to a given API @@ -28,7 +30,7 @@ CFLAGS="%{optflags}" %{__python} setup.py build %install %{__python} setup.py install -O1 --skip-build --root %{buildroot} -# Will put docs in %{_docdir} instead +# Will put docs in %%{_docdir} instead %{__rm} -f %{buildroot}%{python_sitearch}/zope/interface/{,tests/}*.txt # C files don't need to be packaged @@ -37,10 +39,10 @@ CFLAGS="%{optflags}" %{__python} setup.py build # deal with documentation %{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}/ %{__cp} -p src/zope/interface/*.txt src/zope/interface/tests/*.txt \ - %{buildroot}%{_docdir}/%{name}-%{version} + %{buildroot}%{_docdir}/%{name}-%{version} %{__mv} %{buildroot}%{_docdir}/%{name}-%{version}/README{,-development}.txt %{__cp} -p CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt \ - %{buildroot}%{_docdir}/%{name}-%{version}/ + %{buildroot}%{_docdir}/%{name}-%{version}/ %check @@ -58,6 +60,9 @@ CFLAGS="%{optflags}" %{__python} setup.py build %{python_sitearch}/zope.interface-*-nspkg.pth %changelog +* Mon Oct 4 2010 Robin Lee - 3.6.1-7 +- Obsoletes python-zope-filesystem + * Wed Sep 29 2010 jkeating - 3.6.1-6 - Rebuilt for gcc bug 634757