From 1b4e1f3a1786911ce5562a680719116e251b6079 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 10 Jan 2024 03:44:43 +0300 Subject: [PATCH] import python-cpuinfo-8.0.0-1.el9 --- .gitignore | 1 + .python-cpuinfo.metadata | 1 + SOURCES/py-cpuinfo-s390x.patch | 40 ++++++ SPECS/python-cpuinfo.spec | 220 +++++++++++++++++++++++++++++++++ 4 files changed, 262 insertions(+) create mode 100644 .gitignore create mode 100644 .python-cpuinfo.metadata create mode 100644 SOURCES/py-cpuinfo-s390x.patch create mode 100644 SPECS/python-cpuinfo.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8643eef --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/py-cpuinfo-8.0.0.tar.gz diff --git a/.python-cpuinfo.metadata b/.python-cpuinfo.metadata new file mode 100644 index 0000000..1ad2459 --- /dev/null +++ b/.python-cpuinfo.metadata @@ -0,0 +1 @@ +f1efae829c2f18454690681f54634797a62fb381 SOURCES/py-cpuinfo-8.0.0.tar.gz diff --git a/SOURCES/py-cpuinfo-s390x.patch b/SOURCES/py-cpuinfo-s390x.patch new file mode 100644 index 0000000..84e9837 --- /dev/null +++ b/SOURCES/py-cpuinfo-s390x.patch @@ -0,0 +1,40 @@ +diff -up py-cpuinfo-3.2.0/cpuinfo/cpuinfo.py.s390x py-cpuinfo-3.2.0/cpuinfo/cpuinfo.py +--- py-cpuinfo-3.2.0/cpuinfo/cpuinfo.py.s390x 2017-04-19 18:33:13.000000000 +0200 ++++ py-cpuinfo-3.2.0/cpuinfo/cpuinfo.py 2017-04-20 12:04:07.364919224 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # -*- coding: UTF-8 -*- + + # Copyright (c) 2014-2017, Matthew Brennan Jones +@@ -512,6 +511,10 @@ def parse_arch(raw_arch_string): + elif re.match('^powerpc$|^ppc64$|^ppc64le$', raw_arch_string): + arch = 'PPC_64' + bits = 64 ++ # S390X ++ elif re.match('^s390x$', raw_arch_string): ++ arch = 'S390X' ++ bits = 64 + # SPARC + elif re.match('^sparc32$|^sparc$', raw_arch_string): + arch = 'SPARC_32' +@@ -1791,8 +1794,8 @@ def get_cpu_info(): + # Make sure we are running on a supported system + def _check_arch(): + arch, bits = parse_arch(DataSource.raw_arch_string) +- if not arch in ['X86_32', 'X86_64', 'ARM_7', 'ARM_8', 'PPC_64']: +- raise Exception("py-cpuinfo currently only works on X86 and some PPC and ARM CPUs.") ++ if not arch in ['X86_32', 'X86_64', 'ARM_7', 'ARM_8', 'PPC_64', 'S390X']: ++ raise Exception("py-cpuinfo currently only works on X86 and some PPC and ARM CPUs and S390X.") + + def main(): + try: +diff -up py-cpuinfo-3.2.0/setup.py.s390x py-cpuinfo-3.2.0/setup.py +diff -up py-cpuinfo-3.2.0/tests/test_invalid_cpu.py.s390x py-cpuinfo-3.2.0/tests/test_invalid_cpu.py +--- py-cpuinfo-3.2.0/tests/test_invalid_cpu.py.s390x 2017-04-20 12:14:33.984425455 +0200 ++++ py-cpuinfo-3.2.0/tests/test_invalid_cpu.py 2017-04-20 12:52:36.746376882 +0200 +@@ -32,4 +32,4 @@ class TestInvalidCPU(unittest.TestCase): + cpuinfo._check_arch() + self.fail('Failed to raise Exception') + except Exception as err: +- self.assertEqual('py-cpuinfo currently only works on X86 and some PPC and ARM CPUs.', err.args[0]) ++ self.assertEqual('py-cpuinfo currently only works on X86 and some PPC and ARM CPUs and S390X.', err.args[0]) diff --git a/SPECS/python-cpuinfo.spec b/SPECS/python-cpuinfo.spec new file mode 100644 index 0000000..14f3d4e --- /dev/null +++ b/SPECS/python-cpuinfo.spec @@ -0,0 +1,220 @@ +%{?python_enable_dependency_generator} +%global srcname cpuinfo +%global sum Getting CPU info + +Name: python-%{srcname} +Version: 8.0.0 +Release: 1%{?dist} +Summary: %{sum} + +License: MIT +URL: https://github.com/workhorsy/py-cpuinfo +Source0: https://files.pythonhosted.org/packages/source/p/py-%{srcname}/py-%{srcname}-%{version}.tar.gz + +# s390x support +Patch0: py-cpuinfo-s390x.patch + +BuildArch: noarch + +# https://github.com/workhorsy/py-cpuinfo/issues/55 +# ExclusiveArch: %%{ix86} x86_64 %%{power64} s390x noarch + +BuildRequires: python3-devel +BuildRequires: python3-setuptools + +%description +Py-cpuinfo gets CPU info with pure Python. Py-cpuinfo should work without +any extra programs or libraries, beyond what your OS provides. + +These approaches are used for getting info: + Windows Registry + /proc/cpuinfo + sysctl + dmesg + isainfo and psrinfo + Querying x86 CPUID register + + +%package -n python3-%{srcname} +Summary: %{sum} +%{?python_provide:%python_provide python3-%{srcname}} + +%description -n python3-%{srcname} +Py-cpuinfo gets CPU info with pure Python. Py-cpuinfo should work without +any extra programs or libraries, beyond what your OS provides. + +These approaches are used for getting info: + Windows Registry + /proc/cpuinfo + sysctl + dmesg + isainfo and psrinfo + Querying x86 CPUID register + +%prep +%setup -q -n py-%{srcname}-%{version} +rm -rf *.egg-info + +sed -i -e '/^#!\//, 1d' cpuinfo/cpuinfo.py + + +%build +%py3_build + +%install +%py3_install + + +%check +%{__python3} setup.py test + +%files -n python3-%{srcname} +%doc README.rst ChangeLog +%license LICENSE +%{_bindir}/cpuinfo +%{python3_sitelib}/%{srcname}/ +%{python3_sitelib}/py_%{srcname}-%{version}-py3.*.egg-info + + +%changelog +* Wed Jan 10 2024 MSVSphere Packaging Team - 8.0.0-1 +- Rebuilt for MSVSphere 9.3 + +* Thu Apr 15 2021 Parag Nemade - 8.0.0-1 +- Update to 8.0.0 version (#1949623) + +* Wed Jan 27 2021 Fedora Release Engineering - 7.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 7.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 06 2020 Parag Nemade - 7.0.0-1 +- Update to 7.0.0 version (#1853940) + +* Thu Jun 11 2020 Parag Nemade - 6.0.0-1 +- Update to 6.0.0 version (#1846323) + +* Sun May 24 2020 Miro Hrončok - 5.0.0-7 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 5.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 5.0.0-5 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Sat Aug 17 2019 Miro Hrončok - 5.0.0-4 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 5.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jul 23 2019 Parag Nemade - 5.0.0-2 +- Drop the versioned binary and restore to original path name + +* Sat Mar 23 2019 Parag Nemade - 5.0.0-1 +- Update to 5.0.0 version (#1691106) + +* Sat Feb 02 2019 Fedora Release Engineering - 4.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Sep 18 2018 Parag Nemade - 4.0.0-4 +- Remove python2 subpackage + +* Fri Jul 13 2018 Fedora Release Engineering - 4.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 4.0.0-2 +- Rebuilt for Python 3.7 + +* Wed Apr 04 2018 Parag Nemade - 4.0.0-1 +- Update to 4.0.0 version (#1563228) + +* Mon Feb 12 2018 Iryna Shcherbina - 3.3.0-4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 3.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jun 15 2017 Parag Nemade - 3.3.0-1 +- Update to 3.3.0 version + +* Thu Apr 20 2017 Than Ngo - 3.2.0-2 +- added s390x support +- enable all supported archs + +* Thu Apr 20 2017 Parag Nemade - 3.2.0-1 +- Update to 3.2.0 version + +* Sun Apr 09 2017 Parag Nemade - 3.0.0-1 +- Update to 3.0.0 version + +* Tue Mar 14 2017 Parag Nemade - 0.2.7-3 +- One more attempt to fix the ExclusiceArch: tag (Thanks sharckcz) + +* Tue Mar 14 2017 Parag Nemade - 0.2.7-2 +- Resolves:rh#1409636 - python-cpuinfo does not support aarch64, ppc64 + and ppc64le, and s390/s390x + +* Tue Mar 14 2017 Parag Nemade - 0.2.7-1 +- Update to 0.2.7 version + +* Sun Mar 12 2017 Parag Nemade - 0.2.6-1 +- Update to 0.2.6 version + +* Sat Feb 11 2017 Fedora Release Engineering - 0.2.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 0.2.3-4 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 0.2.3-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon Apr 25 2016 Parag Nemade - 0.2.3-2 +- Thanks to Petr Viktorin (rh#1330005) for correcting dependencies + +* Sat Apr 23 2016 Parag Nemade - 0.2.3-1 +- Update to 0.2.3 release (rh#1311530) +- Added %%license tag + +* Thu Feb 04 2016 Fedora Release Engineering - 0.1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Dec 21 2015 Parag Nemade - 0.1.8-1 +- Update to 0.1.8 release (rh#1292653) + +* Tue Nov 10 2015 Fedora Release Engineering - 0.1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Mon Jul 13 2015 Parag Nemade - 0.1.6-1 +- Update to 0.1.6 release (rh#1242523) + +* Thu Jun 18 2015 Fedora Release Engineering - 0.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Feb 12 2015 Parag Nemade - 0.1.4-1 +- Update to 0.1.4 release +- Resolves:rh#1190549 - cpuinfo failed to run + +* Tue Feb 03 2015 Parag Nemade - 0.1.2-3 +- Resolves:rh#1178548, follow dnf way to use py3 binary + +* Fri Oct 03 2014 Parag Nemade - 0.1.2-2 +- Clean the spec to follow py3 guidelines + +* Wed Oct 01 2014 Parag Nemade - 0.1.2-1 +- Update to 0.1.2 release + +* Mon Sep 22 2014 Parag Nemade - 0.1.0-2 +- fix rpmlint messages +- Added upstream LICENSE file not in tarball + +* Mon Sep 22 2014 Parag Nemade - 0.1.0-1 +- Initial packaging +