From 651b9cb67fc2aeddf4ae0672eadb27832032492f Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Dec 18 2011 19:10:33 +0000 Subject: Don't try to filter own provides in el5... --- diff --git a/python-zmq.spec b/python-zmq.spec index a11fcfd..e546510 100644 --- a/python-zmq.spec +++ b/python-zmq.spec @@ -42,13 +42,6 @@ URL: http://www.zeromq.org/bindings:python # git archive --format=tar --prefix=pyzmq-%%{version}/ %%{checkout} | xz -z --force - > pyzmq-%%{version}.tar.xz Source0: http://cloud.github.com/downloads/zeromq/pyzmq/pyzmq-%{version}.tar.gz -%if ! ( 0%{?fedora} > 12 || 0%{?rhel} > 5) -# filtering the el5 way -Source10: pythondeps.sh -%global __python_requires %{SOURCE10} -%global __python_provides %{SOURCE10} -%endif - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if ! ( 0%{?fedora} > 12 || 0%{?rhel} > 5) @@ -270,7 +263,7 @@ popd %changelog * Wed Dec 14 2011 Thomas Spura - 2.1.9-3 - tests package requires main package -- filter python3 and python26 libs +- filter python3 * Thu Dec 8 2011 Thomas Spura - 2.1.9-2 - use proper buildroot macro diff --git a/pythondeps.sh b/pythondeps.sh deleted file mode 100755 index 10a060a..0000000 --- a/pythondeps.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -[ $# -ge 1 ] || { - cat > /dev/null - exit 0 -} - -case $1 in --P|--provides) - shift - # Match buildroot/payload paths of the form - # /PATH/OF/BUILDROOT/usr/bin/pythonMAJOR.MINOR - # generating a line of the form - # python(abi) = MAJOR.MINOR - # (Don't match against -config tools e.g. /usr/bin/python2.6-config) - grep "/usr/bin/python.\..$" \ - | sed -e "s|.*/usr/bin/python\(.\..\)|python(abi) = \1|" - ;; --R|--requires) - shift - # Match buildroot paths of the form - # /PATH/OF/BUILDROOT/usr/lib/pythonMAJOR.MINOR/ and - # /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/ - # generating (uniqely) lines of the form: - # python(abi) = MAJOR.MINOR - grep "/usr/lib[^/]*/python.\../.*" \ - | sed -e "s|.*/usr/lib[^/]*/python\(.\..\)/.*|python(abi) = \1|g" \ - | sort | uniq - ;; -esac - -exit 0