Update of /cvsroot/python/python/dist/src/Misc/RPM In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11657 Modified Files: Tag: release23-maint python-2.3.spec Log Message: Including changes from Ian Holsman to build under Red Hat 7.3. Fixing some problems with the /usr/local path change. Index: python-2.3.spec =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/RPM/python-2.3.spec,v retrieving revision 1.2.12.12 retrieving revision 1.2.12.13 diff -C2 -d -r1.2.12.12 -r1.2.12.13 *** python-2.3.spec 27 May 2004 05:56:12 -0000 1.2.12.12 --- python-2.3.spec 31 May 2004 19:38:08 -0000 1.2.12.13 *************** *** 33,37 **** %define version 2.3.4 %define libvers 2.3 ! %define release 1pydotorg %define __prefix /usr --- 33,37 ---- %define version 2.3.4 %define libvers 2.3 ! %define release 2pydotorg %define __prefix /usr *************** *** 128,131 **** --- 128,135 ---- %changelog + * Thu May 27 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.4-2pydotorg] + - Including changes from Ian Holsman to build under Red Hat 7.3. + - Fixing some problems with the /usr/local path change. + * Sat Mar 27 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.2-3pydotorg] - Being more agressive about finding the paths to fix for *************** *** 242,248 **** # Tools echo '#!/bin/bash' >${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix} ! echo 'exec %{_prefix}/bin/python%{binsuffix} /usr/lib/python%{libvers}/idlelib/idle.py' >>$RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix} chmod 755 $RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix} ! cp -a Tools $RPM_BUILD_ROOT%{_prefix}/lib/python%{libvers} # MAKE FILE LISTS --- 246,252 ---- # Tools echo '#!/bin/bash' >${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix} ! echo 'exec %{__prefix}/bin/python%{binsuffix} /usr/lib/python%{libvers}/idlelib/idle.py' >>$RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix} chmod 755 $RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix} ! cp -a Tools $RPM_BUILD_ROOT%{__prefix}/lib/python%{libvers} # MAKE FILE LISTS *************** *** 272,281 **** # fix the #! line in installed files ! find . -type f -print0 | xargs -0 grep -l /usr/local/bin/python | ! while read file do sed 's|^#!.*python|#!/usr/bin/env python'"%{binsuffix}"'|' \ ! "$RPM_BUILD_ROOT"/"$file" >/tmp/fix-python-path.$$ ! cat /tmp/fix-python-path.$$ >"$RPM_BUILD_ROOT"/"$file" rm -f /tmp/fix-python-path.$$ done --- 276,286 ---- # fix the #! line in installed files ! find "$RPM_BUILD_ROOT" -type f -print0 | ! xargs -0 grep -l /usr/local/bin/python | while read file do + FIXFILE="$file" sed 's|^#!.*python|#!/usr/bin/env python'"%{binsuffix}"'|' \ ! "$FIXFILE" >/tmp/fix-python-path.$$ ! cat /tmp/fix-python-path.$$ >"$FIXFILE" rm -f /tmp/fix-python-path.$$ done *************** *** 315,319 **** %doc Misc/README Misc/cheatsheet Misc/Porting %doc LICENSE Misc/ACKS Misc/HISTORY Misc/NEWS ! %{__prefix}/man/man1/python%{binsuffix}.1.gz %dir %{__prefix}/include/python%{libvers} --- 320,324 ---- %doc Misc/README Misc/cheatsheet Misc/Porting %doc LICENSE Misc/ACKS Misc/HISTORY Misc/NEWS ! %{__prefix}/man/man1/python%{binsuffix}.1* %dir %{__prefix}/include/python%{libvers}