LOG Added patch to skip geenration of pythonegg provides for python3

This commit is contained in:
Denis Silakov 2013-06-14 12:49:52 +04:00
parent 6f3c5e74af
commit 5126a9d116
2 changed files with 18 additions and 2 deletions

View file

@ -0,0 +1,12 @@
diff -Naur rpm-5.4.10.orig/scripts/pythoneggs.py rpm-5.4.10/scripts/pythoneggs.py
--- rpm-5.4.10/scripts/pythoneggs.py 2012-05-08 02:34:19.000000000 +0400
+++ rpm-5.4.10.orig/scripts/pythoneggs.py 2013-06-14 12:44:15.551212810 +0400
@@ -119,6 +119,8 @@
metadata = FileMetadata(f)
dist = Distribution.from_location(path_item, dist_name, metadata)
if Provides:
+ if f.find('python3') > 0:
+ continue
# If egg metadata says package name is python, we provide python(abi)
if dist.key == 'python':
name = 'python(abi)'

View file

@ -59,7 +59,7 @@ Summary: The RPM package management system
Name: rpm
Epoch: 1
Version: %{libver}.%{minorver}
Release: %{?prereldate:0.%{prereldate}.}11
Release: %{?prereldate:0.%{prereldate}.}12
License: LGPLv2.1+
Group: System/Configuration/Packaging
URL: http://rpm5.org/
@ -361,6 +361,9 @@ Patch169: rpm-5.4.10-update-and-use-brp-compress.patch
Patch170: rpm-5.4.10-dbconvert-5.2.patch
# Do not generate pythonegg provides for python3 until we find a better solution
Patch171: rpm-5.4.10-python3-no-egg-provides.patch
# ROSA stuff
Patch501: rpm-5.3.12.vendor.ROSA.patch
# Restore RPM_PACKAGE_NAME export as it's still used by aot-compile-rpm
@ -732,7 +735,8 @@ This package contains the RPM API documentation generated in HTML format.
%patch162 -p1 -b .uninitialized~
%patch169 -p1 -b .brpcomp~
%patch170 -p1 -b .dbconvert52~
# %patch170 -p1 -b .dbconvert52~
%patch171 -p1 -b .python3~
%patch501 -p1 -b .rosa_vendor~
%patch502 -p1 -b .package_name~