From 485d8d82888f9cf2c27c5d35c97fbc3d27c37031 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Fri, 12 Aug 2016 11:07:54 +0200 Subject: [PATCH] - Enable --majorver-provides in Python dependency generator --- rpm-4.13.x-pythondistdeps-fileattr.patch | 2 +- rpm.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rpm-4.13.x-pythondistdeps-fileattr.patch b/rpm-4.13.x-pythondistdeps-fileattr.patch index 1aa9c99..72ab9e6 100644 --- a/rpm-4.13.x-pythondistdeps-fileattr.patch +++ b/rpm-4.13.x-pythondistdeps-fileattr.patch @@ -2,7 +2,7 @@ +++ rpm-4.13.0-rc1/fileattrs/python.attr 2016-06-13 15:50:46.687106846 +0200 @@ -1,4 +1,4 @@ -%__python_provides %{_rpmconfigdir}/pythondeps.sh --provides -+%__python_provides %{_rpmconfigdir}/pythondistdeps.py --provides ++%__python_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides %__python_requires %{_rpmconfigdir}/pythondeps.sh --requires -%__python_path ^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]\\.[[:digit:]]))$ +%__python_path ^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*))|(%{_bindir}/python[[:digit:]]\\.[[:digit:]]))$ diff --git a/rpm.spec b/rpm.spec index cfaf9f7..0da319a 100644 --- a/rpm.spec +++ b/rpm.spec @@ -27,7 +27,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}41%{?dist} +Release: %{?snapver:0.%{snapver}.}42%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 @@ -591,6 +591,9 @@ exit 0 %doc doc/librpm/html/* %changelog +* Fri Aug 12 2016 Florian Festi - 4.4.13.0-0.rc1.42 +- Enable --majorver-provides in Python dependency generator + * Tue Aug 09 2016 Igor Gnatenko - 4.13.0-0.rc1.41 - Add %%{?system_python_abi} - rpm-python -> python2-rpm && rpm-python3 -> python3-rpm with providing old names