diff --git a/python-dmidecode.spec b/python-dmidecode.spec index 1c40927..a93c900 100644 --- a/python-dmidecode.spec +++ b/python-dmidecode.spec @@ -1,7 +1,7 @@ Name: python-dmidecode Summary: Python module to access DMI data Version: 3.12.2 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2 URL: http://projects.autonomy.net.au/python-dmidecode/ Source0: https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz @@ -9,9 +9,6 @@ Source0: https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: libxml2-devel -BuildRequires: python2-devel -BuildRequires: python2-libxml2 - BuildRequires: python3-devel BuildRequires: libxml2-python3 @@ -24,75 +21,36 @@ as python data structures or as XML data using libxml2.\ %description %_description -%package -n python2-dmidecode -Summary: %summary -Requires: python2-libxml2 -%{?python_provide:%python_provide python2-dmidecode} - -%description -n python2-dmidecode %_description - %package -n python3-dmidecode Summary: Python 3 module to access DMI data Requires: libxml2-python3 -%description -n python3-dmidecode -python3-dmidecode is a Python 3 extension module that uses the -code-base of the 'dmidecode' utility, and presents the data -as Python 3 data structures or as XML data using libxml2. - +%description -n python3-dmidecode %_description %prep -%setup -qc -mv %{name}-%{version} python2 -cp -a python{2,3} - -pushd python3 +%setup -q sed -i 's/python2/python3/g' Makefile unit-tests/Makefile -popd %build # Not to get undefined symbol: dmixml_GetContent export CFLAGS="${CFLAGS-} -std=gnu89" - - -for PY in python2 python3; do - pushd $PY - make build - popd -done +make build %install -pushd python2 -%{__python2} src/setup.py install --root %{buildroot} --prefix=%{_prefix} -popd - -pushd python3 %{__python3} src/setup.py install --root %{buildroot} --prefix=%{_prefix} -popd %check -for PY in python2 python3; do - pushd $PY/unit-tests - make - popd -done +pushd unit-tests +make +popd -%files -n python2-dmidecode -%license python2/doc/LICENSE python2/doc/AUTHORS python2/doc/AUTHORS.upstream -%doc python2/README python2/doc/README.upstream -%{python2_sitearch}/dmidecodemod.so -%{python2_sitearch}/dmidecode.py -%{python2_sitearch}/dmidecode.py[co] -%{python2_sitearch}/*.egg-info -%{_datadir}/python-dmidecode/ - %files -n python3-dmidecode -%license python3/doc/LICENSE python3/doc/AUTHORS python3/doc/AUTHORS.upstream -%doc python3/README python3/doc/README.upstream +%license doc/LICENSE doc/AUTHORS doc/AUTHORS.upstream +%doc README doc/README.upstream %{python3_sitearch}/dmidecodemod.cpython-%{python3_version_nodots}*.so %{python3_sitearch}/__pycache__/dmidecode.cpython-%{python3_version_nodots}*.py[co] %{python3_sitearch}/dmidecode.py @@ -100,6 +58,10 @@ done %{_datadir}/python-dmidecode/ %changelog +* Sun Aug 11 2019 Miro HronĨok - 3.12.2-16 +- Subpackage python2-dmidecode has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Fri Jul 26 2019 Fedora Release Engineering - 3.12.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild