Update of /cvsroot/python/python/dist/src/Misc/RPM In directory sc8-pr-cvs1:/tmp/cvs-serv22471 Modified Files: Tag: release23-maint python-2.3.spec Log Message: RPM spec file updates from Sean Reifschneider. Index: python-2.3.spec =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/RPM/python-2.3.spec,v retrieving revision 1.2 retrieving revision 1.2.12.1 diff -C2 -d -r1.2 -r1.2.12.1 *** python-2.3.spec 24 Feb 2003 17:55:37 -0000 1.2 --- python-2.3.spec 22 Sep 2003 04:21:04 -0000 1.2.12.1 *************** *** 31,35 **** %define name python ! %define version 2.3b1 %define libvers 2.3 %define release 1pydotorg --- 31,35 ---- %define name python ! %define version 2.3.1 %define libvers 2.3 %define release 1pydotorg *************** *** 50,56 **** Source: Python-%{version}.tgz Source1: html-%{version}.tar.bz2 ! Patch0: Python-2.1-pythonpath.patch ! #Patch1: Python-2.1-expat.patch ! BuildRoot: /var/tmp/%{name}-%{version}-root BuildPrereq: expat-devel BuildPrereq: db4-devel --- 50,55 ---- Source: Python-%{version}.tgz Source1: html-%{version}.tar.bz2 ! #Patch0: Python-2.1-pythonpath.patch ! BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: expat-devel BuildPrereq: db4-devel *************** *** 123,126 **** --- 122,128 ---- %changelog + * Fri Sep 19 2003 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.1-1pydotorg] + - Updating to the 2.3.1 release. + * Mon Feb 24 2003 Sean Reifschneider <jafo-rpms@tummy.com> [2.3b1-1pydotorg] - Updating to 2.3b1 release. *************** *** 176,181 **** %prep %setup -n Python-%{version} ! %patch0 -p1 ! #%patch1 ######## --- 178,182 ---- %prep %setup -n Python-%{version} ! #%patch0 -p1 ######## *************** *** 183,187 **** ######## %build ! ./configure %{ipv6} %{pymalloc} --prefix=%{__prefix} make --- 184,188 ---- ######## %build ! ./configure --enable-unicode=ucs4 %{ipv6} %{pymalloc} --prefix=%{__prefix} make *************** *** 224,228 **** # Tools echo '#!/bin/bash' >${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix} ! echo 'exec %{_prefix}/bin/python%{binsuffix} /usr/lib/python%{libvers}/Tools/idle/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} --- 225,229 ---- # 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} *************** *** 238,243 **** rm -f tools.files ! find "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/Tools -type f | ! sed "s|^${RPM_BUILD_ROOT}|/|" >tools.files echo "%{__prefix}"/bin/idle%{binsuffix} >>tools.files --- 239,245 ---- rm -f tools.files ! find "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/idlelib \ ! "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/Tools -type f | ! sed "s|^${RPM_BUILD_ROOT}|/|" >tools.files echo "%{__prefix}"/bin/idle%{binsuffix} >>tools.files *************** *** 250,259 **** ) ######## # CLEAN ######## %clean ! rm -fr $RPM_BUILD_ROOT ! rm -f mainpkg.files tools.files ######## --- 252,271 ---- ) + # clean up the /usr/local/bin/python references + find "$RPM_BUILD_ROOT" -type f | xargs grep -l /usr/local/bin/python | while read file + do + rm -f /tmp/pypathtmp + sed 's|/usr/local/bin/python|/usr/bin/python%{binsuffix}|g' <"$file" >/tmp/pypathtmp + cat </tmp/pypathtmp >"$file" + rm -f /tmp/pypathtmp + done + ######## # CLEAN ######## %clean ! #@@@ ! #rm -fr $RPM_BUILD_ROOT ! #rm -f mainpkg.files tools.files ######## *************** *** 275,279 **** %{__prefix}/lib/python%{libvers}/distutils %{__prefix}/lib/python%{libvers}/encodings - %dir %{__prefix}/lib/python%{libvers}/lib-old %{__prefix}/lib/python%{libvers}/plat-linux2 %{__prefix}/lib/python%{libvers}/site-packages --- 287,290 ----