diff --git a/.gitignore b/.gitignore index b60320b..83eb487 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /python-multilib-1.1.tar.gz +/python-multilib-1.2.tar.bz2 diff --git a/python-multilib.spec b/python-multilib.spec index 350f1b6..458e61a 100644 --- a/python-multilib.spec +++ b/python-multilib.spec @@ -1,46 +1,104 @@ Name: python-multilib -Version: 1.1 -Release: 5%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: A module for determining if a package is multilib or not +Group: Development/Libraries License: GPLv2 -URL: https://github.com/Zyzyx/%{name} -Source0: https://github.com/Zyzyx/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildArch: noarch -BuildRequires: python-devel -BuildRequires: python-setuptools -Summary: Python library for determining if a package is multilib enabled +URL: https://pagure.io/releng/python-multilib +Source0: https://releases.pagure.org/releng/python-multilib/%{name}-%{version}.tar.bz2 -Provides: python2-multilib = %{version}-%{release} +BuildArch: noarch + + +%global _description \ +A Python module that supports several multilib "methods" useful for \ +determining if a 32-bit package should be included with its 64-bit analogue \ +in a compose. + +%description %{_description} + +%package conf +Summary: Configuration files for %{name} + +%description conf +This package provides the configuration files for %{name}. + +%package -n python2-multilib +Summary: %{summary} +%{?python_provide:%python_provide python2-multilib} +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-six +Requires: python2-six +Requires: python2 +Requires: %{name}-conf = %{version}-%{release} + +%description -n python2-multilib %{_description} + +%package -n python3-multilib +Summary: %{summary} +%{?python_provide:%python_provide python3-multilib} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-six +Requires: python3-six +Requires: python3 +Requires: %{name}-conf = %{version}-%{release} + +%description -n python3-multilib %{_description} -%description -A Python module that supports several multilib "methods" useful for determining \ -if a 32-bit package should be included with its 64-bit analogue in a compose. %prep %setup -q %build -%{__python} setup.py build +%py2_build +%py3_build %install -%{__python} setup.py install -O1 --skip-build --root %{buildroot} +%py2_install +%py3_install %check # testing requires complete composes available locally, which no buildsystem # would ever want included in a build root +#{__python2} setup.py test +#{__python3} setup.py test + +%files conf +%config(noreplace) %{_sysconfdir}/multilib.conf -%files +%files -n python2-multilib %license LICENSE %doc README.md -%{python_sitelib}/* -%config(noreplace) %{_sysconfdir}/multilib.conf +%{python2_sitelib}/* + +%files -n python3-multilib +%license LICENSE +%doc README.md +%{python3_sitelib}/* + %changelog -* Tue Aug 09 2016 Dennis Gilmore - 1.1-5 -- add provides python2-multilib +* Thu Mar 02 2017 Lubomír Sedlář - 1.2-1 +- New upstream version with support for DNF package objects +- Updated URL to point to new upstream on Pagure.io + +* Sat Feb 11 2017 Fedora Release Engineering - 1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1.1-7 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 1.1-6 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Jun 29 2016 Jay Greguske - 1.1-5 +- Package up for Fedora rawhide -* Mon May 10 2016 Jay Greguske - 1.1-4 -- EPEL 7 related changes to packaging +* Sun May 01 2016 Neal Gompa - 1.1-3 +- Port to Python 3 and enable its subpackage +- Split config file to its own subpackage * Thu Apr 07 2016 Dennis Gilmore - 1.1-2 - setup to make python3 down the road. diff --git a/sources b/sources index 56ec71e..1ee658f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc561564dcdafbca8a29f9d45366b435 python-multilib-1.1.tar.gz +SHA512 (python-multilib-1.2.tar.bz2) = 77e03fe81b7702ed7e00d43a8864bfa11b9bc1f522e513d0974cc323624ef6af89b18d516237de70e81ca292b7f420663c26c83b8830f5572763df7fa8894bdf