From 27dad126b0511bba73d09303411c72cf990114b2 Mon Sep 17 00:00:00 2001 From: Toshio くらとみ Date: Jun 17 2010 23:28:02 +0000 Subject: * Thu Jun 17 2010 Toshio Kuratomi - 4.7.2-1 - Fix traceback when doing from validate import * - Upstream bugfix release --- diff --git a/.cvsignore b/.cvsignore index f7c9184..ec44c3d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -configobj-4.7.0.zip +configobj-4.7.2.zip diff --git a/configobj-import-all-fix.patch b/configobj-import-all-fix.patch new file mode 100644 index 0000000..1fe30c7 --- /dev/null +++ b/configobj-import-all-fix.patch @@ -0,0 +1,12 @@ +Index: configobj-4.7.2/validate.py +=================================================================== +--- configobj-4.7.2.orig/validate.py ++++ configobj-4.7.2/validate.py +@@ -160,7 +160,6 @@ __all__ = ( + 'is_ip_addr_list', + 'is_mixed_list', + 'is_option', +- '__docformat__', + ) + + diff --git a/python-configobj.spec b/python-configobj.spec index edc4d75..f6000ae 100644 --- a/python-configobj.spec +++ b/python-configobj.spec @@ -1,15 +1,17 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} +%if !(0%{?rhel} >= 6 || 0%{?fedora} >= 13) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%endif Name: python-configobj -Version: 4.7.0 -Release: 2%{?dist} +Version: 4.7.2 +Release: 1%{?dist} Summary: Config file reading, writing, and validation Group: System Environment/Libraries License: BSD URL: http://www.voidspace.org.uk/python/configobj.html Source0: http://www.voidspace.org.uk/downloads/configobj-%{version}.zip +Patch0: configobj-import-all-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,7 +39,7 @@ It has lots of other features though: %prep %setup -q -n configobj-%{version} - +%patch0 -p1 -b .all %build %{__python} setup.py build @@ -45,7 +47,7 @@ It has lots of other features though: %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT %check export PYTHONPATH="%{buildroot}/%{python_sitelib}" @@ -60,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/* %changelog +* Thu Jun 17 2010 Toshio Kuratomi - 4.7.2-1 +- Fix traceback when doing from validate import * +- Upstream bugfix release + * Wed Jan 20 2010 Luke Macken - 4.7.0-2 - Merge a bunch of changes from Gareth Armstrong - The src zip file should come either from http://www.voidspace.org.uk/ diff --git a/sources b/sources index ba55c62..e55a682 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -237bb4ffd4eaa6208805138499806421 configobj-4.7.0.zip +51cee395cfbf831339b03f72706de18e configobj-4.7.2.zip