diff --git a/macros.python b/macros.python index 9240d61..376b1f5 100644 --- a/macros.python +++ b/macros.python @@ -14,7 +14,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("%{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)));\ diff --git a/python.spec b/python.spec index 179e126..3c17642 100644 --- a/python.spec +++ b/python.spec @@ -108,7 +108,7 @@ Summary: An interpreted, interactive, object-oriented programming language Name: %{python} # Remember to also rebase python-docs when changing this: Version: 2.7.10 -Release: 4%{?dist} +Release: 5%{?dist} License: Python Group: Development/Languages Requires: %{python}-libs%{?_isa} = %{version}-%{release} @@ -2156,6 +2156,9 @@ rm -fr %{buildroot} # ====================================================== %changelog +* Wed Jul 22 2015 Thomas Spura - 2.7.10-5 +- Include epoch in the python_provide macro fpc#534 (Slavek Kabrda) + * Mon Jun 29 2015 Thomas Spura - 2.7.10-4 - correct python_provide macro to include version only when emiting provides