rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Band-aid for python library versioning inadequacies (#1435135)"

Browse Source 
It's not needed anymore and requires rebuilding RPM each time python updates.

This reverts commit fca9dfc3c7.
This commit is contained in:
Igor Gnatenko 2017-07-20 15:31:47 +02:00
parent 284dc31743
commit 85793f4048
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rpm.spec
View File

@ -15,10 +15,6 @@
# build with new db format # build with new db format
%bcond_with ndb %bcond_with ndb
%define pyver_cmd "import sys; sys.stdout.write('= %s' % sys.version.split(' ')[0])"
%define py2_fullver %(%{__python2} -c %{pyver_cmd})
%define py3_fullver %(%{__python3} -c %{pyver_cmd})
%define rpmhome /usr/lib/rpm %define rpmhome /usr/lib/rpm
%global rpmver 4.13.0.1 %global rpmver 4.13.0.1
@ -33,7 +29,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}32%{?dist} Release: %{?snapver:0.%{snapver}.}33%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
@ -312,7 +308,6 @@ BuildRequires: python2-devel
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release}
Requires: python2-libs%{?_isa} %{py2_fullver}
%description -n python2-%{name} %description -n python2-%{name}
The python2-rpm package contains a module that permits applications The python2-rpm package contains a module that permits applications
@ -331,7 +326,6 @@ BuildRequires: python3-devel
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Provides: %{name}-python3 = %{version}-%{release} Provides: %{name}-python3 = %{version}-%{release}
Obsoletes: %{name}-python3 < %{version}-%{release} Obsoletes: %{name}-python3 < %{version}-%{release}
Requires: system-python-libs%{?_isa} %{py3_fullver}
%description -n python3-%{name} %description -n python3-%{name}
The python3-rpm package contains a module that permits applications The python3-rpm package contains a module that permits applications
@ -649,6 +643,9 @@ exit 0
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Thu Jul 20 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.13.0.1-33
- Remove strict requirement on python libs
* Tue Jul 18 2017 Mark Wielaard <mjw@fedoraproject.org> - 4.13.0.1-32 * Tue Jul 18 2017 Mark Wielaard <mjw@fedoraproject.org> - 4.13.0.1-32
- Add find-debuginfo.sh: Add --keep-section and --remove-section (#1465997) - Add find-debuginfo.sh: Add --keep-section and --remove-section (#1465997)