Use python3 for rpm generators
Use lowercase names for cmake provides in generator (in addition to old names)
This commit is contained in:
parent
0d9eb67fed
commit
1bb4a5c968
13
cmake.prov
13
cmake.prov
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python3
|
||||||
# -*- coding:utf-8 -*-
|
# -*- coding:utf-8 -*-
|
||||||
#
|
#
|
||||||
# Copyright (C) 2015 Daniel Vrátil <dvratil@redhat.com>
|
# Copyright (C) 2015 Daniel Vrátil <dvratil@redhat.com>
|
||||||
@ -37,9 +37,16 @@ class CMakeParser:
|
|||||||
version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase)
|
version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase)
|
||||||
|
|
||||||
if version:
|
if version:
|
||||||
print("cmake(%s) = %s" % (cmakeModule, version))
|
string = "cmake(" + cmakeModule + ") = " + version
|
||||||
else:
|
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):
|
def parseCmakeModuleConfig(self, configFile):
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python3
|
||||||
# -*- coding:utf-8 -*-
|
# -*- coding:utf-8 -*-
|
||||||
#
|
#
|
||||||
# Copyright (C) 2017 Björn Esser <besser82@fedoraproject.org>
|
# Copyright (C) 2017 Björn Esser <besser82@fedoraproject.org>
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
|
|
||||||
Name: %{orig_name}%{?name_suffix}
|
Name: %{orig_name}%{?name_suffix}
|
||||||
Version: %{major_version}.%{minor_version}.0
|
Version: %{major_version}.%{minor_version}.0
|
||||||
Release: 0.1%{?relsuf}%{?dist}
|
Release: 0.2%{?relsuf}%{?dist}
|
||||||
Summary: Cross-platform make system
|
Summary: Cross-platform make system
|
||||||
|
|
||||||
# most sources are BSD
|
# most sources are BSD
|
||||||
@ -489,6 +489,10 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 27 2020 Orion Poplawski <orion@nwra.com> - 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 <besser82@fedoraproject.org> - 3.17.0-0.1.rc1
|
* Mon Feb 17 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.0-0.1.rc1
|
||||||
- Update to 3.17.0-rc1
|
- Update to 3.17.0-rc1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user