Author: sparky Date: Sun Apr 23 02:20:43 2006 New Revision: 7363 Added: ppcrcd/trunk/rpm.spec.patch Modified: ppcrcd/trunk/base.pkgs Log: - patch for rpm spec for not to use python at all
Modified: ppcrcd/trunk/base.pkgs ============================================================================== --- ppcrcd/trunk/base.pkgs (original) +++ ppcrcd/trunk/base.pkgs Sun Apr 23 02:20:43 2006 @@ -317,6 +317,13 @@ cp kernel.config out/rpm/SOURCES/kernel-ppc-smp.config sleep 1 && touch $@ +out/rpm/SPECS/rpm.spec: out/touch/builder_prepared rpm.spec.patch + rm -f $@ + cd $(dir $@) && cvs up $(if $(REV-$(@:out/rpm/SPECS/%.spec=%)),-r \ + $(REV-$(@:out/rpm/SPECS/%.spec=%)),-A) $(notdir $@) + cd out/rpm/SPECS && patch -p0 < $(PWD)/rpm.spec.patch + sleep 1 && touch $@ + out/rpm/prep/busybox: out/rpm/sources/busybox busybox-initrd.config cp busybox-initrd.config out/rpm/SOURCES/busybox.config cp busybox-initrd.config out/rpm/SOURCES/busybox-initrd.config Added: ppcrcd/trunk/rpm.spec.patch ============================================================================== --- (empty file) +++ ppcrcd/trunk/rpm.spec.patch Sun Apr 23 02:20:43 2006 @@ -0,0 +1,27 @@ +Index: rpm.spec +=================================================================== +RCS file: /cvsroot/SPECS/rpm.spec,v +retrieving revision 1.555.2.169 +diff -u -r1.555.2.169 rpm.spec +--- rpm.spec 12 Apr 2006 13:59:48 -0000 1.555.2.169 ++++ rpm.spec 23 Apr 2006 00:18:26 -0000 +@@ -133,7 +133,7 @@ + BuildRequires: patch >= 2.2 + BuildRequires: popt-devel >= %{reqpopt_ver} + %{?with_python:BuildRequires: python-devel >= 1:2.3} +-BuildRequires: python-modules >= 1:2.3 ++#BuildRequires: python-modules >= 1:2.3 + BuildRequires: readline-devel + BuildRequires: rpm-perlprov + %{?with_python:BuildRequires: rpm-pythonprov} +@@ -911,8 +911,8 @@ + /{__spec_install_post_compress_modules}/d + ' $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros + +-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir} +-%py_comp $RPM_BUILD_ROOT%{py_sitedir} ++#%%py_ocomp $RPM_BUILD_ROOT%{py_sitedir} ++#%%py_comp $RPM_BUILD_ROOT%{py_sitedir} + + for f in $RPM_BUILD_ROOT%{_datadir}/locale/{en_RN,eu_ES,gl,hu,ro,wa,zh,zh_CN.GB2312}/LC_MESSAGES/rpm.mo ; do + [ "`file $f | sed -e 's/.*,//' -e 's/message.*//'`" -le 1 ] && rm -f $f _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit