rpms/rpm/devel rpm-4.8.0-pythondeps-parallel.patch, 1.1, 1.2 rpm.spec, 1.386, 1.387
Panu Matilainen
pmatilai at fedoraproject.org
Tue Feb 9 07:12:24 UTC 2010
Author: pmatilai
Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24361
Modified Files:
rpm-4.8.0-pythondeps-parallel.patch rpm.spec
Log Message:
- unbreak python(abi) requires generation (#562906)
rpm-4.8.0-pythondeps-parallel.patch:
pythondeps.sh | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
Index: rpm-4.8.0-pythondeps-parallel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm-4.8.0-pythondeps-parallel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rpm-4.8.0-pythondeps-parallel.patch 30 Jan 2010 10:16:46 -0000 1.1
+++ rpm-4.8.0-pythondeps-parallel.patch 9 Feb 2010 07:12:23 -0000 1.2
@@ -29,7 +29,7 @@ index 7ccd076..7bf6fec 100755
+ # /PATH/OF/BUILDROOT/usr/lib64/pythonMAJOR.MINOR/
+ # generating (uniqely) lines of the form:
+ # python(abi) = MAJOR.MINOR
-+ grep "/usr/lib[^/]*/python.\../*" \
++ grep "/usr/lib[^/]*/python.\../.*" \
+ | sed -e "s|.*/usr/lib[^/]*/python\(.\..\)/.*|python(abi) = \1|g" \
+ | sort | uniq
;;
Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- rpm.spec 6 Feb 2010 10:12:44 -0000 1.386
+++ rpm.spec 9 Feb 2010 07:12:24 -0000 1.387
@@ -21,7 +21,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
-Release: 8%{?dist}
+Release: 9%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -417,6 +417,9 @@ exit 0
%doc doc/librpm/html/*
%changelog
+* Fri Feb 05 2010 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-9
+- unbreak python(abi) requires generation (#562906)
+
* Fri Feb 05 2010 Panu Matilainen <pmatilai at redhat.com> - 4.8.0-8
- more fixes to postscript provides extractor (#562228)
- avoid accessing unrelated mount points in disk space checking (#547548)
More information about the scm-commits
mailing list