diff --git a/.gitignore b/.gitignore index 26b3ad6..cc3ea39 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /pyzmq-0.1.20100725git18f5d06.tar.xz +/pyzmq-2.0.8.tar.gz +/pyzmq-2.0.10.tar.gz diff --git a/python-zmq.spec b/python-zmq.spec index f13ab3c..ae4e7b4 100644 --- a/python-zmq.spec +++ b/python-zmq.spec @@ -3,16 +3,18 @@ %endif -%global _use_internal_dependency_generator 0 -%global __find_provides %{_rpmconfigdir}/find-provides | grep -v _zmq.so +%{?filter_setup: +%filter_provides_in %{python_sitearch}/.*\.so$ +%filter_setup +} %global checkout 18f5d061558a176f5496aa8e049182c1a7da64f6 %global srcname pyzmq Name: python-zmq -Version: 0.1.20100725git18f5d06 -Release: 3%{?dist} +Version: 2.0.10 +Release: 1%{?dist} Summary: Software library for fast, message-based applications Group: Development/Libraries @@ -23,8 +25,7 @@ URL: http://www.zeromq.org/bindings:python # git clone http://github.com/zeromq/pyzmq.git pyzmq.git # cd pyzmq.git # git archive --format=tar --prefix=pyzmq-%%{version}/ %%{checkout} | xz -z --force - > pyzmq-%%{version}.tar.xz -Source0: %{srcname}-%{version}.tar.xz -Patch0: python-zmq-os-walk.patch +Source0: http://cloud.github.com/downloads/zeromq/pyzmq/pyzmq-%{version}.tar.gz BuildRequires: python2-devel BuildRequires: python-setuptools @@ -70,7 +71,6 @@ This package contains the python bindings. %prep %setup -q -n %{srcname}-%{version} -%patch0 -p1 # remove shebangs for lib in zmq/eventloop/*.py; do sed '/\/usr\/bin\/env/d' $lib > $lib.new && @@ -79,11 +79,13 @@ for lib in zmq/eventloop/*.py; do done # remove excecutable bits -chmod -x examples/kernel/frontend.py chmod -x examples/pubsub/topics_pub.py -chmod -x examples/kernel/kernel.py chmod -x examples/pubsub/topics_sub.py +# delete hidden files +#find examples -name '.*' | xargs rm -v + + %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -126,18 +128,22 @@ popd %check rm zmq/__* -pushd zmq -PYTHONPATH=%{buildroot}%{python_sitearch} nosetests -popd +#pushd zmq + #PYTHONPATH=%{buildroot}%{python_sitearch} nosetests +#popd +PYTHONPATH=%{buildroot}%{python_sitearch} \ + %{__python} setup.py test rm -r %{buildroot}%{python_sitearch}/zmq/tests %if 0%{?with_python3} # there is no python3-nose yet pushd %{py3dir} rm zmq/__* - pushd zmq + #pushd zmq #PYTHONPATH=%{buildroot}%{python3_sitearch} nosetests - popd + #popd + #PYTHONPATH=%{buildroot}%{python3_sitearch} \ + # %{__python3} setup.py test rm -r %{buildroot}%{python3_sitearch}/zmq/tests popd %endif @@ -161,6 +167,11 @@ popd %changelog +* Thu Jan 13 2011 Thomas Spura - 2.0.10-1 +- update to new version +- remove patch (is upstream) +- run tests differently + * Thu Aug 5 2010 Thomas Spura - 0.1.20100725git18f5d06-3 - add missing BR for 2to3 diff --git a/sources b/sources index 652a3fa..75dfa42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9fd5482f4103735747ecf2aa6c6ab0e pyzmq-0.1.20100725git18f5d06.tar.xz +b8b397b2b459c6cdf7571eca5b697bc5 pyzmq-2.0.10.tar.gz