Author: hawk Date: Wed Aug 5 23:33:44 2009 GMT Module: packages Tag: HEAD ---- Log message: - revert small upstream breakage, they assume some symbols are in each and every version of rpm which seems not true for our rpm.spec:rpm-4_5
---- Files affected: packages/yum: yum.spec (1.76 -> 1.77) , yum-pld.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/yum/yum.spec diff -u packages/yum/yum.spec:1.76 packages/yum/yum.spec:1.77 --- packages/yum/yum.spec:1.76 Thu Aug 6 00:43:37 2009 +++ packages/yum/yum.spec Thu Aug 6 01:33:38 2009 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Narzędzie do instalowania/uaktualniania pakietów RPM Name: yum Version: 3.2.23 -Release: 2 +Release: 3 License: GPL Group: Applications/System Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz @@ -15,6 +15,7 @@ Patch1: %{name}-obsoletes.patch # from util-vserver-*/contrib/ Patch2: %{name}-chroot.patch +Patch3: %{name}-pld.patch URL: http://yum.baseurl.org/ BuildRequires: gettext-devel BuildRequires: intltool @@ -64,6 +65,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__make} @@ -176,6 +178,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.77 2009/08/05 23:33:38 hawk +- revert small upstream breakage, they assume some symbols are in each and + every version of rpm which seems not true for our rpm.spec:rpm-4_5 + Revision 1.76 2009/08/05 22:43:37 hawk - release 2 ================================================================ Index: packages/yum/yum-pld.patch diff -u /dev/null packages/yum/yum-pld.patch:1.1 --- /dev/null Thu Aug 6 01:33:44 2009 +++ packages/yum/yum-pld.patch Thu Aug 6 01:33:38 2009 @@ -0,0 +1,21 @@ +diff -ur yum-3.2.23.orig/yum/packages.py yum-3.2.23/yum/packages.py +--- yum-3.2.23.orig/yum/packages.py 2009-05-14 18:41:21.000000000 +0200 ++++ yum-3.2.23/yum/packages.py 2009-08-06 01:28:15.261213302 +0200 +@@ -1200,12 +1200,13 @@ + is a pre-requires or a not""" + # FIXME this should probably be put in rpmUtils.miscutils since + # - that's what it is ++ newflag = flag + if flag is not None: +- # Note: RPMSENSE_PREREQ == 0 since rpm-4.4'ish +- if flag & (rpm.RPMSENSE_PREREQ | +- rpm.RPMSENSE_SCRIPT_PRE | +- rpm.RPMSENSE_SCRIPT_POST): ++ newflag = flag & rpm.RPMSENSE_PREREQ ++ if newflag == rpm.RPMSENSE_PREREQ: + return 1 ++ else: ++ return 0 + return 0 + + def _requires_with_pre(self): ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/yum/yum.spec?r1=1.76&r2=1.77&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
