Author: glen Date: Tue Jan 18 07:20:19 2011 GMT Module: packages Tag: HEAD ---- Log message: - setuptools-0.6c11-py2.7.egg-info is now a file, try to workaround by renaming it with upper caps - rel 3
---- Files affected: packages/python-distribute: python-distribute.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: packages/python-distribute/python-distribute.spec diff -u packages/python-distribute/python-distribute.spec:1.18 packages/python-distribute/python-distribute.spec:1.19 --- packages/python-distribute/python-distribute.spec:1.18 Sat Nov 13 01:18:55 2010 +++ packages/python-distribute/python-distribute.spec Tue Jan 18 08:20:14 2011 @@ -13,7 +13,7 @@ Summary: Easily download, build, install, upgrade, and uninstall Python packages Name: python-distribute Version: 0.6.14 -Release: 2 +Release: 3 License: PSF or ZPL Group: Development/Languages/Python Source0: http://pypi.python.org/packages/source/d/distribute/distribute-%{version}.tar.gz @@ -91,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT%{py_sitescriptdir}/setuptools/tests # reinstall site.py deleted by py_postclean cp build-2/lib/site.py $RPM_BUILD_ROOT%{py_sitescriptdir}/site.py + +# rename to avoid rpm dir-to-file conflict from upgrade from python-setuptools +egg=$(basename $RPM_BUILD_ROOT%{py_sitescriptdir}/setuptools-*.egg-info) +mv $RPM_BUILD_ROOT%{py_sitescriptdir}/$egg $RPM_BUILD_ROOT%{py_sitescriptdir}/S${egg#?} %endif %if %{with python3} @@ -116,7 +120,8 @@ %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/easy_install-2.* -%{py_sitescriptdir}/*.egg-info +%{py_sitescriptdir}/distribute-%{version}-py*.egg-info +%{py_sitescriptdir}/Setuptools-*.egg-info %dir %{py_sitescriptdir}/setuptools %dir %{py_sitescriptdir}/setuptools/command %{py_sitescriptdir}/pkg_resources.py[co] @@ -132,7 +137,8 @@ %files -n python3-%{pname} %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/easy_install-3.* -%{py3_sitescriptdir}/*.egg-info +%{py3_sitescriptdir}/distribute-%{version}-py*.egg-info +%{py3_sitescriptdir}/setuptools-*.egg-info %dir %{py3_sitescriptdir}/setuptools %dir %{py3_sitescriptdir}/setuptools/command %{py3_sitescriptdir}/pkg_resources.py[co] @@ -150,6 +156,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.19 2011/01/18 07:20:14 glen +- setuptools-0.6c11-py2.7.egg-info is now a file, try to workaround by renaming it with upper caps +- rel 3 + Revision 1.18 2010/11/13 00:18:55 pawelz - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-distribute/python-distribute.spec?r1=1.18&r2=1.19&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
