diff options
| author | Anssi Hannula <anssi@mandriva.org> | 2010-10-30 03:13:02 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mandriva.org> | 2010-10-30 03:13:02 +0000 |
| commit | e1458f1de2af82596fe6cebed0af60e2ac0bc2b7 (patch) | |
| tree | be9e65e86007b90205f6fd8a61fcbc6b15bf8a46 | |
| parent | 9c94735c6bab67a0fc6513b1dcf265a4b45b34cb (diff) | |
| download | rpm-setup-e1458f1de2af82596fe6cebed0af60e2ac0bc2b7.tar rpm-setup-e1458f1de2af82596fe6cebed0af60e2ac0bc2b7.tar.gz rpm-setup-e1458f1de2af82596fe6cebed0af60e2ac0bc2b7.tar.bz2 rpm-setup-e1458f1de2af82596fe6cebed0af60e2ac0bc2b7.tar.xz rpm-setup-e1458f1de2af82596fe6cebed0af60e2ac0bc2b7.zip | |
- remove runtime dependencies from %py_requires as they are now handled
automatically
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | build.macros.in | 5 |
2 files changed, 3 insertions, 4 deletions
@@ -1,5 +1,7 @@ - generate requires on "python(abi) = x.y" instead of "python >= x.y" for python modules to properly handle the strict dependency +- remove runtime dependencies from %py_requires as they are now handled + automatically Version 1.110 - 18 October 2010, by Per Øyvind Karlsen - fix warning from rubygems.rb diff --git a/build.macros.in b/build.macros.in index 0c810e5..30ca07f 100644 --- a/build.macros.in +++ b/build.macros.in @@ -293,10 +293,7 @@ find %1 -name '*.pyo' -exec rm -f {} \\; \ python -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \ } %py_requires(d) \ -%define minver %py_ver \ -%define maxver %(python -c "import sys; a,b=sys.version_info[:2]; print '%%d.%%d'%%(a,b+1)" 2>/dev/null || echo PYTHON-NOT-FOUND) \ -BuildRequires: python %{-d:python-devel} \ -Requires: python >= %minver, python < %maxver +BuildRequires: python %{-d:python-devel} #------------------------------------------------------------------------------ |