From 1bb4a5c968439e63bc3eebf9780f497f40d4b673 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 26 Feb 2020 20:59:26 -0700 Subject: [PATCH] Use python3 for rpm generators Use lowercase names for cmake provides in generator (in addition to old names) --- cmake.prov | 13 ++++++++++--- cmake.req | 2 +- cmake.spec | 6 +++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/cmake.prov b/cmake.prov index f569c23..58d3522 100644 --- a/cmake.prov +++ b/cmake.prov @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding:utf-8 -*- # # Copyright (C) 2015 Daniel Vrátil @@ -37,9 +37,16 @@ class CMakeParser: version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase) if version: - print("cmake(%s) = %s" % (cmakeModule, version)) + string = "cmake(" + cmakeModule + ") = " + version else: - print("cmake(%s)" % cmakeModule) + string = "cmake(" + cmakeModule + ")" + if string == string.lower(): + print(string) + else: + # Temporarily print both variants to satisfy requires + # by the old version of this generator which made mistakes + print(string) + print(string.lower()) def parseCmakeModuleConfig(self, configFile): diff --git a/cmake.req b/cmake.req index 2a58ca3..9af5c44 100644 --- a/cmake.req +++ b/cmake.req @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding:utf-8 -*- # # Copyright (C) 2017 Björn Esser diff --git a/cmake.spec b/cmake.spec index 184b6a0..f916620 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.1%{?relsuf}%{?dist} +Release: 0.2%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -489,6 +489,10 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Thu Feb 27 2020 Orion Poplawski - 3.17.0-0.2.rc1 +- Use python3 for rpm generators +- Use lowercase names for cmake provides in generator (in addition to old names) + * Mon Feb 17 2020 Björn Esser - 3.17.0-0.1.rc1 - Update to 3.17.0-rc1