Attachment 1079196 Details for Bug 1241655 – Fixes to the python_provide macro

[patch] Fixes to the python_provide macro

updated_py_provide.patch (text/plain), 1.54 KB, created by Thomas Spura on 2015-10-01 16:34:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Spura

Created: 2015-10-01 16:34:33 UTC

Size: 1.54 KB

patch

obsolete

>diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros
>index 0972b1e..47a89ff 100644
>--- a/macros.epel-rpm-macros
>+++ b/macros.epel-rpm-macros
>@@ -28,12 +28,17 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski
>                 return string.sub(String,1,string.len(Start))==Start\
>         end\
>         str = rpm.expand("%{?1:%{1}}");\
>-        vr = rpm.expand("%{version}-%{release}")
>+        vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}")
>         if (string.starts(str, "python2-")) then\
>                 print("Provides: python-");\
>                 print(string.sub(str,9,string.len(str)));\
>                 print(" = ");\
>                 print(vr);\
>+                --Obsoleting the previous default python package\
>+                print("\\nObsoletes: python-");\
>+                print(string.sub(str,9,string.len(str)));\
>+                print(" < ");\
>+                print(vr);\
>         elseif (string.starts(str, "python3-")) then\
>                 --No unversioned provides as python3 is not default\
>         elseif (string.starts(str, "pypy-")) then\
>@@ -43,7 +48,7 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski
>         elseif (string.starts(str, "python-")) then\
>                 --Providing the current default python\
>                 print("Provides: python2-");\
>-                print(string.sub(str,9,string.len(str)));\
>+                print(string.sub(str,8,string.len(str)));\
>                 print(" = ");\
>                 print(vr);\
>         else\

Actions: View | Diff

Attachments on bug 1241655: 1050380 | 1079196