Remove python2 from kf5-ki18n, heimdal, libvirt (#2260)
This commit is contained in:
Thomas Crain
GitHub
Родитель
904a1ba3ec
Коммит
6fdea0705f
|
|
@ -1,156 +0,0 @@
|
|||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/hx509/quote.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Copyright (c) 2010 Kungliga Tekniska Högskolan
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/Makefile.am
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am
|
||||
@@ -89,7 +89,7 @@ idn_lookup_SOURCES = idn-lookup.c
|
||||
|
||||
LDADD = libwind.la $(LIB_roken)
|
||||
|
||||
-PYTHON = python
|
||||
+PYTHON = python2
|
||||
|
||||
if !MAINTAINER_MODE
|
||||
skip_python = test -f $@ ||
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/UnicodeData.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-bidi.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-combining.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-errorlist.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-map.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-normalize.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-punycode-examples.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/generate.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc3454.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc4518.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/stringprep.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/util.py
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/python
|
||||
+#!/usr/bin/python2
|
||||
# -*- coding: iso-8859-1 -*-
|
||||
|
||||
# $Id$
|
||||
Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32
|
||||
===================================================================
|
||||
--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/windows/NTMakefile.w32
|
||||
+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32
|
||||
@@ -120,7 +120,7 @@ RC=rc
|
||||
AWK_CMD=gawk.exe
|
||||
YACC_CMD=bison.exe
|
||||
LEX_CMD=flex.exe
|
||||
-PYTHON=python.exe
|
||||
+PYTHON=python2.exe
|
||||
PERL=perl.exe
|
||||
CMP=cmp.exe
|
||||
MAKECAT=makecat.exe
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
From 6415a2032ec4b2ecc5917dae85b8f9e6f9e221d2 Mon Sep 17 00:00:00 2001
|
||||
From: Quanah Gibson-Mount <quanah@symas.com>
|
||||
Date: Tue, 28 Apr 2020 20:16:40 +0000
|
||||
Subject: [PATCH] Fix #696 - Find python as part of the configure process
|
||||
instead of hard coding it.
|
||||
|
||||
Change-Id: I66d91f16d156d1a940f41ab16a049fb38f0e8bc4
|
||||
---
|
||||
configure.ac | 1 +
|
||||
lib/wind/Makefile.am | 2 --
|
||||
2 files changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 662de5d876..39c3110854 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -18,6 +18,7 @@ dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
AC_PROG_CPP
|
||||
+AM_PATH_PYTHON
|
||||
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
|
||||
diff --git a/lib/wind/Makefile.am b/lib/wind/Makefile.am
|
||||
index 0b493118b3..4a34496fcf 100644
|
||||
--- a/lib/wind/Makefile.am
|
||||
+++ b/lib/wind/Makefile.am
|
||||
@@ -89,8 +89,6 @@ idn_lookup_SOURCES = idn-lookup.c
|
||||
|
||||
LDADD = libwind.la $(LIB_roken)
|
||||
|
||||
-PYTHON = python
|
||||
-
|
||||
if !MAINTAINER_MODE
|
||||
skip_python = test -f $@ ||
|
||||
endif
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
Summary: A Kerberos 5 implementation without export restrictions
|
||||
Name: heimdal
|
||||
Version: 7.7.0
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: BSD AND MIT
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -39,8 +39,8 @@ Source31: %{name}-ipropd-slave-wrapper
|
|||
# klist, kswitch, and kvno are symlinks to "heimtools", and this utility needs
|
||||
# to know how to interpret the "heimdal-" prefixes.
|
||||
Patch1: heimdal-1.6.0-c25f45a-rename-commands.patch
|
||||
# Use Python2 explicity.
|
||||
Patch3: heimdal-7.5.0-explicit-python2.patch
|
||||
# Upstream patch to properly detect python when configuring
|
||||
Patch3: %{name}-python3.patch
|
||||
Patch4: heimdal-7.7.0-configure.patch
|
||||
Patch5: fix_test_rand_build_failure.patch
|
||||
BuildRequires: bison
|
||||
|
|
@ -63,7 +63,7 @@ BuildRequires: pam-devel
|
|||
BuildRequires: perl-JSON
|
||||
#BuildRequires: doxygen
|
||||
#BuildRequires: graphviz
|
||||
BuildRequires: python2
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: texinfo
|
||||
|
|
@ -145,11 +145,8 @@ This package prepends the Heimdal binary directory to the beginning of
|
|||
PATH.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .cmds
|
||||
%patch3 -p1 -b .python2
|
||||
%patch4 -p1 -b .config
|
||||
%patch5 -p1
|
||||
%autosetup -p1
|
||||
%py3_shebang_fix .
|
||||
|
||||
./autogen.sh
|
||||
|
||||
|
|
@ -488,6 +485,11 @@ fi
|
|||
%{_sysconfdir}/profile.d/%{name}.csh
|
||||
|
||||
%changelog
|
||||
* Thu Feb 17 2022 Thomas Crain <thcrain@microsoft.com> - 7.7.0-7
|
||||
- Remove python2 patch and build requirement
|
||||
- Add patch to fix python detection during configuration
|
||||
- Fix python script shebang lines
|
||||
|
||||
* Mon Apr 26 2021 Thomas Crain <thcrain@microsoft.com> - 7.7.0-6
|
||||
- Replace incorrect %%{_lib} usage with %%{_libdir}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
Name: kf5-%{framework}
|
||||
Version: 5.61.0
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: KDE Frameworks 5 Tier 1 addon for localization
|
||||
License: BSD and LGPLv2+
|
||||
URL: https://cgit.kde.org/%{framework}.git
|
||||
|
|
@ -19,8 +19,7 @@ Distribution: Mariner
|
|||
BuildRequires: extra-cmake-modules >= %{majmin}
|
||||
BuildRequires: gettext
|
||||
BuildRequires: kf5-rpm-macros >= %{majmin}
|
||||
# FindPythonInterp.cmake , can find/use multiple versions, rely on the default for now
|
||||
BuildRequires: python2
|
||||
BuildRequires: python3
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: qt5-qtdeclarative-devel
|
||||
|
||||
|
|
@ -33,7 +32,8 @@ KDE Frameworks 5 Tier 1 addon for localization.
|
|||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: gettext
|
||||
Requires: python2
|
||||
Requires: python3
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
|
@ -46,7 +46,7 @@ developing applications that use %{name}.
|
|||
%build
|
||||
mkdir %{_target_platform}
|
||||
pushd %{_target_platform}
|
||||
%{cmake_kf5} ..
|
||||
%{cmake_kf5} .. -DPYTHON_EXECUTABLE=%{python3}
|
||||
popd
|
||||
|
||||
%make_build -C %{_target_platform}
|
||||
|
|
@ -90,6 +90,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 17 2022 Thomas Crain <thcrain@microsoft.com> - 5.61.0-4
|
||||
- Remove python2, replace with python3
|
||||
|
||||
* Thu Apr 23 2020 Pawel Winogrodzki <pawelwi@microsoft.com> - 5.61.0-3
|
||||
- License verified.
|
||||
- Fixed Source0 tag.
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
Summary: Virtualization API library that supports KVM, QEMU, Xen, ESX etc
|
||||
Name: libvirt
|
||||
Version: 7.10.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: LGPLv2+
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -90,7 +90,6 @@ Requires: libssh2
|
|||
Requires: libtirpc
|
||||
Requires: libxml2
|
||||
Requires: parted
|
||||
Requires: python2
|
||||
Requires: readline
|
||||
Requires: systemd
|
||||
|
||||
|
|
@ -1072,6 +1071,9 @@ exit 0
|
|||
%{_libdir}/libnss_libvirt_guest.so.2
|
||||
|
||||
%changelog
|
||||
* Thu Feb 17 2022 Thomas Crain <thcrain@microsoft.com> - 7.10.0-2
|
||||
- Remove requirement on python2 (python in general is not needed at runtime)
|
||||
|
||||
* Tue Jan 04 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 7.10.0-1
|
||||
- Updating to version 7.10.0.
|
||||
- Switched to building with "meson".
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче