rpms/rpmlint
6
0
Fork 0
Code Issues Pull Requests Releases Activity

force python3 as exec binary

Browse Source
This commit is contained in:
Tom Callaway 2018-10-05 15:43:45 -04:00
parent 9d8f6ca034
commit 41b3d2a725
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpmlint-1.10-force-python3.patch Normal file
View File

@ -0,0 +1,18 @@
diff -up rpmlint-rpmlint-1.10/rpmdiff.py3 rpmlint-rpmlint-1.10/rpmdiff
--- rpmlint-rpmlint-1.10/rpmdiff.py3 2018-10-05 15:30:14.361433625 -0400
+++ rpmlint-rpmlint-1.10/rpmdiff 2018-10-05 15:31:01.096404906 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
# -*- coding: utf-8 -*-
#
# Copyright (C) 2006 Mandriva; 2009 Red Hat, Inc.; 2009 Ville Skyttä
diff -up rpmlint-rpmlint-1.10/rpmlint.py3 rpmlint-rpmlint-1.10/rpmlint
--- rpmlint-rpmlint-1.10/rpmlint.py3 2018-10-05 15:31:13.647128639 -0400
+++ rpmlint-rpmlint-1.10/rpmlint 2018-10-05 15:31:18.967011541 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python -ttOu
+#!/usr/bin/python3 -ttOu
# -*- coding: utf-8 -*-
#############################################################################
# File : rpmlint

9
rpmlint.spec
View File

@ -23,7 +23,7 @@
Name: rpmlint Name: rpmlint
Version: 1.10 Version: 1.10
Release: 17%{?dist} Release: 18%{?dist}
Summary: Tool for checking common errors in RPM packages Summary: Tool for checking common errors in RPM packages
Group: Development/Tools Group: Development/Tools
License: GPLv2 License: GPLv2
@ -52,6 +52,7 @@ BuildRequires: python3-pytest
#BuildRequires: python3-flake8-import-order #BuildRequires: python3-flake8-import-order
Requires: python3 Requires: python3
Requires: rpm-python3 >= 4.4.2.2 Requires: rpm-python3 >= 4.4.2.2
Patch5: rpmlint-1.10-force-python3.patch
%else %else
BuildRequires: python >= 2.6 BuildRequires: python >= 2.6
BuildRequires: rpm-python >= 4.4.2.2 BuildRequires: rpm-python >= 4.4.2.2
@ -99,6 +100,9 @@ and source packages as well as spec files can be checked.
%patch2 -p1 -b .missing-files %patch2 -p1 -b .missing-files
%patch3 -p1 -b .py37mtime %patch3 -p1 -b .py37mtime
%patch4 -p1 -b .py37magic %patch4 -p1 -b .py37magic
%if %{with python3}
%patch5 -p1
%endif
sed -i -e /MenuCheck/d Config.py sed -i -e /MenuCheck/d Config.py
cp -p config config.example cp -p config config.example
install -pm 644 %{SOURCE3} config install -pm 644 %{SOURCE3} config
@ -141,6 +145,9 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
%{_mandir}/man1/rpmlint.1* %{_mandir}/man1/rpmlint.1*
%changelog %changelog
* Fri Oct 5 2018 Tom Callaway <spot@fedoraproject.org> - 1.10-18
- force python3 as exec binary
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-17 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild