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:12:08 Branch: rpm-5_4 Handle: 2011040102120701 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/macros python.in Log: use pythoneggs.py for python deps generated by internal generator. Summary: Revision Changes Path 1.3501.2.88 +1 -0 rpm/CHANGES 1.6.2.1 +2 -2 rpm/macros/python.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3501.2.87 -r1.3501.2.88 CHANGES --- rpm/CHANGES 1 Apr 2011 02:03:42 -0000 1.3501.2.87 +++ rpm/CHANGES 1 Apr 2011 02:12:07 -0000 1.3501.2.88 @@ -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.6.2.1 python.in --- rpm/macros/python.in 19 Oct 2010 03:02:00 -0000 1.6 +++ rpm/macros/python.in 1 Apr 2011 02:12:08 -0000 1.6.2.1 @@ -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