From a1bb119345b942b461ec6d11f7dd1e4a7325b10d Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Apr 04 2018 19:26:26 +0000 Subject: Python3 subpackage. --- diff --git a/python-datanommer-models.spec b/python-datanommer-models.spec index 5b3510d..3c8315c 100644 --- a/python-datanommer-models.spec +++ b/python-datanommer-models.spec @@ -2,7 +2,7 @@ Name: python-datanommer-models Version: 0.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SQLAlchemy models for datanommer Group: Development/Libraries @@ -12,48 +12,63 @@ Source0: https://pypi.io/packages/source/d/%{modname}/%{modname}-%{versio BuildArch: noarch +%global _description\ +SQLAlchemy models for datanommer. + +%description %_description + +%package -n datanommer-config +Summary: Config files for datanommer + +%description -n datanommer-config +Config files for datanommer. + +%package -n python2-datanommer-models +Summary: %summary + +%{?python_provide:%python_provide python2-datanommer-models} + BuildRequires: python2-devel BuildRequires: python2-setuptools # Just for the tests BuildRequires: python2-nose BuildRequires: python2-fedmsg-meta-fedora-infrastructure +BuildRequires: python2-fedmsg-core +BuildRequires: python2-alembic +BuildRequires: python2-sqlalchemy >= 0.7 +Requires: datanommer-config +Requires: python2-fedmsg-core +Requires: python2-alembic +Requires: python2-sqlalchemy >= 0.7 -BuildRequires: fedmsg +%description -n python2-datanommer-models %_description -BuildRequires: python2-alembic +%package -n python3-datanommer-models +Summary: %summary -%if 0%{?rhel} && 0%{?rhel} <= 6 -BuildRequires: python-sqlalchemy0.7 -%else -BuildRequires: python2-sqlalchemy >= 0.7 -%endif +%{?python_provide:%python_provide python3-datanommer-models} -%global _description\ -SQLAlchemy models for datanommer. +BuildRequires: python3-devel +BuildRequires: python3-setuptools -%description %_description +# Just for the tests +BuildRequires: python3-nose +BuildRequires: python3-fedmsg-meta-fedora-infrastructure +BuildRequires: python3-fedmsg-core +BuildRequires: python3-alembic +BuildRequires: python3-sqlalchemy >= 0.7 -%package -n python2-datanommer-models -Summary: %summary -Requires: fedmsg -Requires: python2-alembic -%if 0%{?rhel} && 0%{?rhel} <= 6 -Requires: python-sqlalchemy0.7 -%else -Requires: python2-sqlalchemy >= 0.7 -%endif -%{?python_provide:%python_provide python2-datanommer-models} +Requires: datanommer-config +Requires: python3-fedmsg-core +Requires: python3-alembic +Requires: python3-sqlalchemy >= 0.7 -%description -n python2-datanommer-models %_description +%description -n python3-datanommer-models %_description %prep %setup -q -n %{modname}-%{version} -# Make sure that epel/rhel picks up the correct version of sqlalchemy -%{__awk} 'NR==1{print "import __main__; __main__.__requires__ = __requires__ = [\"sqlalchemy>=0.7\"]; import pkg_resources"}1' setup.py > setup.py.tmp -%{__mv} setup.py.tmp setup.py - # Disable the consumer by default. # https://github.com/fedora-infra/datanommer/issues/55 sed -i 's/True/False/g' fedmsg.d/example-datanommer.py @@ -66,10 +81,12 @@ sed -i 's/\/\/tmp\/datanommer.db//' fedmsg.d/example-datanommer.py rm -rf *.egg-info %build -%{__python} setup.py build +%py2_build +%py3_build %install -%{__python} setup.py install -O1 --skip-build --root=%{buildroot} +%py2_install +%py3_install # fedmsg owns this directory, but we're going to add a file. %{__mkdir_p} %{buildroot}%{_sysconfdir}/fedmsg.d/ @@ -81,17 +98,28 @@ rm -rf *.egg-info %{__cp} -r alembic/ %{buildroot}%{_datadir}/%{modname}/alembic/ %check -%{__python} setup.py test +%{__python2} setup.py test +%{__python3} setup.py test -%files -n python2-datanommer-models +%files -n datanommer-config %doc README.rst LICENSE -%{python_sitelib}/datanommer/ -%{python_sitelib}/%{modname}-%{version}* %{_datadir}/%{modname}/ - %config(noreplace) %{_sysconfdir}/fedmsg.d/datanommer.py* +%files -n python2-datanommer-models +%doc README.rst LICENSE +%{python2_sitelib}/datanommer/ +%{python2_sitelib}/%{modname}-%{version}* + +%files -n python3-datanommer-models +%doc README.rst LICENSE +%{python3_sitelib}/datanommer/ +%{python3_sitelib}/%{modname}-%{version}* + %changelog +* Wed Apr 04 2018 Ralph Bean - 0.9.1-2 +- Python3 subpackage. + * Wed Apr 04 2018 Ralph Bean - 0.9.1-1 - new version