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:
Revision Changes 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 -0000 1.3589
+++ rpm/CHANGES 1 Apr 2011 02:11:13 -0000 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 -0000 1.6
+++ rpm/macros/python.in 1 Apr 2011 02:11:13 -0000 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 Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
