Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-23 10:23:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup the patch

Browse source
This commit is contained in:
Denis Silakov 2013-06-14 15:57:09 +04:00
parent fd996799eb
commit e1c1811f65
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rpm-5.4.10-python3-egg-reqs.patch
View file

@ -1,19 +1,3 @@
diff -Naur rpm-5.4.10.orig/rpm-5.4.10-python3-no-egg-provides.patch rpm-5.4.10/rpm-5.4.10-python3-no-egg-provides.patch
--- rpm-5.4.10.orig/rpm-5.4.10-python3-no-egg-provides.patch 1970-01-01 03:00:00.000000000 +0300
+++ rpm-5.4.10/rpm-5.4.10-python3-no-egg-provides.patch 2013-06-14 12:45:01.000000000 +0400
@@ -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)'
diff -Naur rpm-5.4.10.orig/scripts/pythoneggs.py rpm-5.4.10/scripts/pythoneggs.py
--- rpm-5.4.10.orig/scripts/pythoneggs.py 2013-06-14 14:26:18.171626023 +0400
+++ rpm-5.4.10/scripts/pythoneggs.py 2013-06-14 14:28:45.434611910 +0400