From 86a7ec8de5a6de252986e63c8268cb394cb493f5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 14 Jan 2016 14:32:55 -0700 Subject: [PATCH] EPEL version --- macros.python-srpm | 7 ++++++- python-rpm-macros.spec | 11 ++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/macros.python-srpm b/macros.python-srpm index 4257beb..b515582 100644 --- a/macros.python-srpm +++ b/macros.python-srpm @@ -1,3 +1,8 @@ # python3_pkgversion specifies the version of Python 3 in the distro. It can be # a specific version (e.g. 34 in Fedora EPEL7) -%python3_pkgversion 3 +%python3_pkgversion 34 +#python3_other_pkgversion 35 +# Set to /bin/true when not active to avoid %ifdefs in specfiles +%__python3_other /bin/true +%py3_other_build /bin/true +%py3_other_install /bin/true diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index d71e19c..52a97a2 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 4%{?dist} +Release: 4%{?dist}.1 Summary: The unversioned Python RPM macros License: MIT @@ -10,8 +10,6 @@ Source2: macros.python2 Source3: macros.python3 BuildArch: noarch -Obsoletes: python-macros < 3 -Provides: python-macros = %{version}-%{release} %description This package contains the unversioned Python RPM macros, that most @@ -28,16 +26,12 @@ RPM macros for building Python source packages. %package -n python2-rpm-macros Summary: RPM macros for building Python 2 packages -# Would need to be different for each release - worth it? -#Conflicts: python2-devel < 2.7.11-3 %description -n python2-rpm-macros RPM macros for building Python 2 packages. %package -n python3-rpm-macros Summary: RPM macros for building Python 3 packages -# Would need to be different for each release - worth it? -#Conflicts: python3-devel < 3.5.1-3 %description -n python3-rpm-macros RPM macros for building Python 3 packages. @@ -67,6 +61,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %changelog +* Thu Jan 14 2016 Orion Poplawski 3-4.1 +- EPEL version + * Wed Jan 13 2016 Orion Poplawski 3-4 - Fix python2/3-rpm-macros package names