diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index f3c1858..b084d80 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,6 +1,6 @@ Name: epel-rpm-macros Version: 7 -Release: 4 +Release: 5 Summary: Extra Packages for Enterprise Linux RPM macros Group: System Environment/Base @@ -34,6 +34,9 @@ install -Dpm 644 %{SOURCE0} \ %changelog +* Mon Jan 4 2016 Orion Poplawski 7-5 +- Fix python_provide macro for EPEL7 python3 package names + * Thu Oct 8 2015 Thomas Spura - 7-4 - Fix python_provide macro to use epoch and obsolete previous python- package diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros index 47a89ff..d85526d 100644 --- a/macros.epel-rpm-macros +++ b/macros.epel-rpm-macros @@ -28,7 +28,7 @@ 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("%{?epoch:%{epoch}:}%{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)));\ @@ -41,6 +41,10 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski print(vr);\ elseif (string.starts(str, "python3-")) then\ --No unversioned provides as python3 is not default\ + elseif (string.starts(str, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then\ + --No unversioned provides as python3 is not default\ + elseif (string.starts(str, "python" .. rpm.expand("%{python3_other_pkgversion}") .. "-")) then\ + --No unversioned provides as python3 is not default\ elseif (string.starts(str, "pypy-")) then\ --No unversioned provides as pypy is not default\ elseif (string.starts(str, "pypy3-")) then\ @@ -54,7 +58,7 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski else\ print("ERROR: ");\ print(str);\ - print("not recognized.");\ + print(" not recognized by %python_provide.");\ end\ }