[CVS] RPM: rpm/ CHANGES rpm/macros/ python.in
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:19:24
Branch: HEAD Handle: 2011041011192400
Modified files:
rpm CHANGES
rpm/macros python.in
Log:
macros: sync with updated python macros from mandriva.
Summary:
RevisionChanges Path
1.3609 +1 -0 rpm/CHANGES
1.8 +28 -20 rpm/macros/python.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3608 -r1.3609 CHANGES
--- rpm/CHANGES 10 Apr 2011 10:50:13 - 1.3608
+++ rpm/CHANGES 10 Apr 2011 11:19:24 - 1.3609
@@ -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.7 -r1.8 python.in
--- rpm/macros/python.in 1 Apr 2011 02:11:13 - 1.7
+++ rpm/macros/python.in 10 Apr 2011 11:19:24 - 1.8
@@ -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'
[CVS] RPM: rpm/ CHANGES rpm/macros/ python.in
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: 01-Apr-2011 04:11:14
Branch: HEAD Handle: 2011040102111300
Modified files:
rpm CHANGES
rpm/macros python.in
Log:
use pythoneggs.py for python deps generated by internal generator.
Summary:
RevisionChanges Path
1.3590 +1 -0 rpm/CHANGES
1.7 +2 -2 rpm/macros/python.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3589 -r1.3590 CHANGES
--- rpm/CHANGES 1 Apr 2011 02:02:17 - 1.3589
+++ rpm/CHANGES 1 Apr 2011 02:11:13 - 1.3590
@@ -1,4 +1,5 @@
5.4.0 - 5.4.1:
+- proyvind: use pythoneggs.py for python deps generated by internal
generator.
- proyvind: rpmfc: enable ruby file classifier internal dep generator.
- devzero2000: misread the review, repost as the original patch
- devzero2000: change the order for the _initddir macro assignment
@@ .
patch -p0 '@@ .'
Index: rpm/macros/python.in
$ cvs diff -u -r1.6 -r1.7 python.in
--- rpm/macros/python.in 19 Oct 2010 03:02:00 - 1.6
+++ rpm/macros/python.in 1 Apr 2011 02:11:13 - 1.7
@@ -8,8 +8,8 @@
#
# Note: Used iff _use_internal_dependency_generator is non-zero. The
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
-%__python_provides %{_rpmhome}/pythondeps.sh --provides
-%__python_requires %{_rpmhome}/pythondeps.sh --requires
+%__python_provides %{_rpmhome}/pythoneggs.py --provides
+%__python_requires %{_rpmhome}/pythoneggs.py --requires
#
# python main version
%py_ver %(echo `python -c import sys; print sys.version[:3]`)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/macros/ python.in rpm/scripts/ Makefile.am...
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: 19-Oct-2010 04:46:53
Branch: HEAD Handle: 2010101902465201
Added files:
rpm/scripts pythoneggs.py
Modified files:
rpm CHANGES
rpm/macros python.in
rpm/scripts Makefile.am
Log:
proyvind: add automatic pythoneggs() dependencies. (finish up last
details tomorrow..)
Summary:
RevisionChanges Path
1.3481 +1 -0 rpm/CHANGES
1.4 +2 -0 rpm/macros/python.in
1.72+2 -2 rpm/scripts/Makefile.am
1.1 +83 -0 rpm/scripts/pythoneggs.py
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3480 -r1.3481 CHANGES
--- rpm/CHANGES 19 Oct 2010 02:34:03 - 1.3480
+++ rpm/CHANGES 19 Oct 2010 02:46:52 - 1.3481
@@ -1,4 +1,5 @@
5.3.4 - 5.4a1:
+- proyvind: add automatic pythoneggs() dependencies.
- proyvind: ditch %gem_unpack macro and make %setup automatically handle
ruby gem extraction in stead.
- jbj: sqlite: fix: permit building without sqlite, db51/dbsql.h
instead.
@@ .
patch -p0 '@@ .'
Index: rpm/macros/python.in
$ cvs diff -u -r1.3 -r1.4 python.in
--- rpm/macros/python.in 21 Aug 2009 16:48:52 - 1.3
+++ rpm/macros/python.in 19 Oct 2010 02:46:53 - 1.4
@@ -10,6 +10,8 @@
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
%__python_provides %{_rpmhome}/pythondeps.sh --provides
%__python_requires %{_rpmhome}/pythondeps.sh --requires
+%__python_suggests %{_rpmhome}/pythoneggs.py --suggests
+%__python_conflicts %{_rpmhome}/pythoneggs.py --conflicts
#
# python main version
%py_ver %(echo `python -c import sys; print sys.version[:3]`)
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/Makefile.am
$ cvs diff -u -r1.71 -r1.72 Makefile.am
--- rpm/scripts/Makefile.am 16 Oct 2010 10:04:43 - 1.71
+++ rpm/scripts/Makefile.am 19 Oct 2010 02:46:52 - 1.72
@@ -23,7 +23,7 @@
mono-find-provides mono-find-requires \
nix_meta \
osgideps.pl pkgconfigdeps.sh \
- perldeps.pl perl.prov perl.req pythondeps.sh \
+ perldeps.pl perl.prov perl.req pythoneggs.py \
php.prov php.req rpm2cpio \
rpmdb_loadcvt rpmdiff rpmdiff.cgi \
rpm.daily rpm.log rpm.xinetd \
@@ -54,7 +54,7 @@
javadeps.sh libtooldeps.sh \
mono-find-provides mono-find-requires \
osgideps.pl pkgconfigdeps.sh \
- perldeps.pl perl.prov perl.req pythondeps.sh \
+ perldeps.pl perl.prov perl.req pythoneggs.py \
php.prov php.req \
rpm2cpio rpmdb_loadcvt \
rpm.daily rpm.log rpm.xinetd \
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/pythoneggs.py
$ cvs diff -u -r0 -r1.1 pythoneggs.py
--- /dev/null 2010-10-19 04:46:21.0 +0200
+++ pythoneggs.py 2010-10-19 04:46:52.874584459 +0200
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+from getopt import getopt
+from os.path import basename, dirname, splitext
+from sys import argv, stdin, version
+from pkg_resources import PathMetadata, Distribution
+from distutils.sysconfig import get_python_lib
+
+
+opts, args = getopt(argv[1:], 'hPRSECO',
+['help', 'provides', 'requires', 'suggests', 'enhances',
'conflicts', 'obsoletes'])
+
+Provides = False
+Requires = False
+Suggests = False
+Enhances = False
+Conflicts = False
+Obsoletes = False
+
+for o, a in opts:
+if o in ('-h', '--help'):
+print '-h, --help\tPrint help'
+print '-P, --provides\tPrint Provides'
+print '-R, --requires\tPrint Requires'
+print '-S, --suggests\tPrint Suggests'
+print '-E, --enhances\tPrint Enhances (unused)'
+print '-C, --conflicts\tPrint Conflicts'
+print '-O, --obsoletes\tPrint Obsoletes (unused)'
+exit(1)
+elif o in ('-P', '--provides'):
+Provides = True
+elif o in ('-R', '--requires'):
+Requires = True
+elif o in ('-S', '--suggests'):
+Suggests = True
+elif o in ('-E', '--enhances'):
+Enhances = True
+elif o in ('-C', '--conflicts'):
+
[CVS] RPM: rpm/ CHANGES rpm/macros/ python.in
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: 19-Oct-2010 04:49:07
Branch: HEAD Handle: 2010101902490600
Modified files:
rpm CHANGES
rpm/macros python.in
Log:
update and correctify %py_* directory macros.
Summary:
RevisionChanges Path
1.3482 +1 -0 rpm/CHANGES
1.5 +20 -13 rpm/macros/python.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3481 -r1.3482 CHANGES
--- rpm/CHANGES 19 Oct 2010 02:46:52 - 1.3481
+++ rpm/CHANGES 19 Oct 2010 02:49:06 - 1.3482
@@ -1,4 +1,5 @@
5.3.4 - 5.4a1:
+- proyvind: update and correctify %py_* directory macros.
- proyvind: add automatic pythoneggs() dependencies.
- proyvind: ditch %gem_unpack macro and make %setup automatically handle
ruby gem extraction in stead.
@@ .
patch -p0 '@@ .'
Index: rpm/macros/python.in
$ cvs diff -u -r1.4 -r1.5 python.in
--- rpm/macros/python.in 19 Oct 2010 02:46:53 - 1.4
+++ rpm/macros/python.in 19 Oct 2010 02:49:06 - 1.5
@@ -2,11 +2,11 @@
# To make use of these macros insert the following line into your spec file:
# %{load:%{_usrlibrpm}/macros.d/python}
-%__python@__PYTHON@
+%__python@__PYTHON@
# 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}/pythondeps.sh --provides
%__python_requires %{_rpmhome}/pythondeps.sh --requires
@@ -14,23 +14,30 @@
%__python_conflicts %{_rpmhome}/pythoneggs.py --conflicts
#
# python main version
-%py_ver %(echo `python -c import sys; print sys.version[:3]`)
+%py_ver %(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_incdir @oldincludedir@/python%{py_ver}
-%py_sitedir %{py_libdir}/site-packages
-%py_dyndir %{py_libdir}/lib-dynload
+# directories
+%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_incdir %(python -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_inc()' 2/dev/null || echo
PYTHON-INCLUDEDIR-NOT-FOUND)
+%py_sitedir %py_puresitedir
+%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_dyndir %{py_platlibdir}/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'):])
-%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)
[CVS] RPM: rpm/ CHANGES rpm/macros/ python.in rpm/scripts/ Makefile.am
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 19-Oct-2010 05:02:00
Branch: HEAD Handle: 2010101903015901
Modified files:
rpm CHANGES
rpm/macros python.in
rpm/scripts Makefile.am
Log:
- revert last change.
Summary:
RevisionChanges Path
1.3483 +0 -2 rpm/CHANGES
1.6 +13 -22 rpm/macros/python.in
1.73+4 -4 rpm/scripts/Makefile.am
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3482 -r1.3483 CHANGES
--- rpm/CHANGES 19 Oct 2010 02:49:06 - 1.3482
+++ rpm/CHANGES 19 Oct 2010 03:01:59 - 1.3483
@@ -1,6 +1,4 @@
5.3.4 - 5.4a1:
-- proyvind: update and correctify %py_* directory macros.
-- proyvind: add automatic pythoneggs() dependencies.
- proyvind: ditch %gem_unpack macro and make %setup automatically handle
ruby gem extraction in stead.
- jbj: sqlite: fix: permit building without sqlite, db51/dbsql.h
instead.
@@ .
patch -p0 '@@ .'
Index: rpm/macros/python.in
$ cvs diff -u -r1.5 -r1.6 python.in
--- rpm/macros/python.in 19 Oct 2010 02:49:06 - 1.5
+++ rpm/macros/python.in 19 Oct 2010 03:02:00 - 1.6
@@ -2,42 +2,33 @@
# To make use of these macros insert the following line into your spec file:
# %{load:%{_usrlibrpm}/macros.d/python}
-%__python@__PYTHON@
+%__python@__PYTHON@
# Path to scripts to autogenerate python package dependencies,
#
-# Note: Used if _use_internal_dependency_generator is non-zero. The
+# Note: Used iff _use_internal_dependency_generator is non-zero. The
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
%__python_provides %{_rpmhome}/pythondeps.sh --provides
%__python_requires %{_rpmhome}/pythondeps.sh --requires
-%__python_suggests %{_rpmhome}/pythoneggs.py --suggests
-%__python_conflicts %{_rpmhome}/pythoneggs.py --conflicts
#
# python main version
-%py_ver %(echo `python -c import sys; print
sys.version[:3]`)
+%py_ver %(echo `python -c import sys; print sys.version[:3]`)
# directories
-# directories
-%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_incdir %(python -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_inc()' 2/dev/null || echo
PYTHON-INCLUDEDIR-NOT-FOUND)
-%py_sitedir %py_puresitedir
-%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_dyndir %{py_platlibdir}/lib-dynload
+%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
# 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'):])
-%python_sitearch %(%{__python} -c import os; from
