RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 13:20:11
Branch: rpm-5_4 Handle: 2011041011201001
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros python.in
Log:
macros: sync with updated python macros from mandriva.
Summary:
Revision Changes Path
1.3501.2.108+1 -0 rpm/CHANGES
1.6.2.2 +28 -20 rpm/macros/python.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.107 -r1.3501.2.108 CHANGES
--- rpm/CHANGES 10 Apr 2011 10:54:19 -0000 1.3501.2.107
+++ rpm/CHANGES 10 Apr 2011 11:20:10 -0000 1.3501.2.108
@@ -1,4 +1,5 @@
5.4.0 -> 5.4.1:
+ - proyvind: macros: sync with updated python macros from mandriva.
- proyvind: rpmfc: add internel dep generator helper for kernel modules.
- provyind: kmod-deps.sh: add dependency extractor from mandriva.
- proyvind: rpmds: implement devel(libfoo) symlink dependencies from
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/python.in
============================================================================
$ cvs diff -u -r1.6.2.1 -r1.6.2.2 python.in
--- rpm/macros/python.in 1 Apr 2011 02:12:08 -0000 1.6.2.1
+++ rpm/macros/python.in 10 Apr 2011 11:20:11 -0000 1.6.2.2
@@ -6,35 +6,43 @@
# Path to scripts to autogenerate python package dependencies,
#
-# Note: Used iff _use_internal_dependency_generator is non-zero. The
+# Note: Used if _use_internal_dependency_generator is non-zero. The
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
%__python_provides %{_rpmhome}/pythoneggs.py --provides
%__python_requires %{_rpmhome}/pythoneggs.py --requires
#
+%python_sitearch %(%{__python} -c "import os; from distutils.sysconfig
import get_python_lib; lib=get_python_lib(1); print os.path.islink(lib) and
os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib")
+%python_sitelib %(%{__python} -c "import os; from distutils.sysconfig
import get_python_lib; lib=get_python_lib(); print os.path.islink(lib) and
os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib")
+%python_version %(%{__python} -c "import sys; print(sys.version[0:3])")
+
# python main version
-%py_ver %(echo `python -c "import sys; print sys.version[:3]"`)
+%py_ver %(%{__python} -c "import sys;
v=sys.version_info[:2]; print '%%d.%%d'%%v" 2>/dev/null || echo
PYTHON-NOT-FOUND)
+%py_prefix %(%{__python} -c "import sys; print sys.prefix"
2>/dev/null || echo PYTHON-NOT-FOUND)
+%py_platlibdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=1)' 2>/dev/null
|| echo PYTHON-LIBDIR-NOT-FOUND)
+%py_purelibdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=0)' 2>/dev/null
|| echo PYTHON-LIBDIR-NOT-FOUND)
+# backward compatibility
+%py_libdir %py_purelibdir
+
+%py_platsitedir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib(plat_specific=1)' 2>/dev/null || echo
PYTHON-LIBDIR-NOT-FOUND)
+%py_puresitedir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib()' 2>/dev/null || echo
PYTHON-LIBDIR-NOT-FOUND)
+%py_sitedir %py_puresitedir
-# directories
-%py_prefix %(echo `python -c "import sys; print sys.prefix"`)
-%py_libdir %{py_prefix}/lib/python%{py_ver}
-%py_incdir @oldincludedir@/python%{py_ver}
-%py_sitedir %{py_libdir}/site-packages
-%py_dyndir %{py_libdir}/lib-dynload
+%py_dyndir %{py_libdir}/lib-dynload
-# pure python modules compilation
-%py_comp %{__python} -c "import compileall; import sys;
compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
+%py_incdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_inc()' 2>/dev/null || echo
PYTHON-INCLUDEDIR-NOT-FOUND)
-%py_ocomp %{__python} -O -c "import compileall; import sys;
compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
+%py_compile(O) \
+find %1 -name '*.pyc' -exec rm -f {} \\; \
+%{__python} -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 \
+%{-O: \
+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 \
+}
-%python_sitearch %(%{__python} -c "import os; from distutils.sysconfig
import get_python_lib; lib=get_python_lib(1); print os.path.islink(lib) and
os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib")
-%python_sitelib %(%{__python} -c "import os; from distutils.sysconfig
import get_python_lib; lib=get_python_lib(); print os.path.islink(lib) and
os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib")
-%python_version %(%{__python} -c "import sys; print(sys.version[0:3])")
+# pure python modules compilation
+%py_comp %{__python} -c "import compileall; import sys;
compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('%{buildroot}'):])"
-%py_compile(O) \
-find %1 -name '*.pyc' -name '*.pyo' -exec rm -f {} \\; \
-%{__python} %{?O:-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_ocomp %{__python} -O -c "import compileall; import sys;
compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('%{buildroot}'):])"
%py_requires(d) \
-%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} \
-PreReq: python >= %{python_version}, python < %{maxver}
+BuildRequires: %{__python} %{-d:python-devel}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
