rpm.spec, BR: python ?

[Bob Budowniczy]

A tak bedzie dobrze?

On Sun, May 01, 2005 at 02:15:08PM +0200, Bob Budowniczy wrote:
> diff -u -r1.555.2.62 rpm.spec
> --- rpm.spec    1 May 2005 10:43:34 -0000       1.555.2.62
> +++ rpm.spec    1 May 2005 12:08:02 -0000
> @@ -122,6 +122,7 @@
>  BuildRequires: patch >= 2.2
>  BuildRequires: popt-devel >= %{reqpopt_ver}
>  %{?with_python:BuildRequires:  python-devel >= 2.2}
> +BuildRequires: python >= 2.2

  +${?with_python:BuildRequires:  python >= 2.2}

>  BuildRequires: python-modules >= 2.2
>  BuildRequires: rpm-perlprov
>  BuildRequires: rpm-pythonprov

Jak makra maja sie wykonac, to moze tak powinno byc? python-devel ma w
req tylko python-libs, wiec /usr/bin/python nie bedzie w systemie
(nie sprawdzilem, tylko tak mi sie zdaje).

Dodatkowo patch dla makr, ktory sprawdzilem u siebie.

-- 
best regards
q#
-------------- następna część ---------
Index: rpm.macros
===================================================================
RCS file: /cvsroot/./SOURCES/rpm.macros,v
retrieving revision 1.158.4.37
diff -u -r1.158.4.37 rpm.macros
--- rpm.macros	1 May 2005 10:42:27 -0000	1.158.4.37
+++ rpm.macros	2 May 2005 18:38:36 -0000
@@ -463,21 +463,21 @@
 
 # Python specific macro definitions.
 # python main version
-%py_ver         %(echo `python -c "import sys; print sys.version[:3]"`)
+%py_ver		%([ -e %{__python} ] && echo `%{__python} -c "import sys; print sys.version[:3]"`)
 
 # directories
-%py_prefix      %(echo `python -c "import sys; print sys.prefix"`)
-%py_libdir      %{py_prefix}/%{_lib}/python%{py_ver}
+%py_prefix	%([ -e %{__python} ] && echo `%{__python} -c "import sys; print sys.prefix"`)
+%py_libdir	%{py_prefix}/%{_lib}/python%{py_ver}
 %py_scriptdir	%{py_prefix}/share/python%{py_ver}
-%py_incdir      /usr/include/python%{py_ver}
+%py_incdir	/usr/include/python%{py_ver}
 %py_sitedir	%{py_libdir}/site-packages
 %py_sitescriptdir %{py_scriptdir}/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_comp	%{__python} -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
 
-%py_ocomp       python -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
+%py_ocomp	%{__python} -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
 
 # Software written in Python language require Python with main version
 %pyrequires_eq() Requires:	python(bytecode) = %py_ver %1