diff --git a/.gitignore b/.gitignore index 59f4618..8490629 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /Logbook-0.7.0.tar.gz /Logbook-0.11.3.tar.gz /Logbook-1.0.0.tar.gz +/Logbook-1.4.0.tar.gz diff --git a/python-logbook.spec b/python-logbook.spec index 8e59742..30fb49e 100644 --- a/python-logbook.spec +++ b/python-logbook.spec @@ -1,38 +1,23 @@ -%if 0%{?fedora} > 12 || 0%{?rhel} > 6 -%global with_python3 1 -%endif - -# Re-enable Python 3 support once the following are resolved: -# https://github.com/mitsuhiko/logbook/issues/42 -# https://github.com/mitsuhiko/logbook/issues/43 - -# we don't want to provide private python extension libs %{?filter_setup: -%filter_provides_in %{python2_sitearch}/.*\.so$ %filter_provides_in %{python3_sitearch}/.*\.so$ %filter_setup } Name: python-logbook -Version: 1.0.0 -Release: 12%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: A logging replacement for Python -Group: Development/Libraries License: BSD URL: http://pypi.python.org/pypi/Logbook/ Source0: http://pypi.python.org/packages/source/L/Logbook/Logbook-%{version}.tar.gz -BuildRequires: gcc -BuildRequires: python2-devel python2-pytest -BuildRequires: python2-sqlalchemy python2-zmq python2-execnet python2-jinja2 -%if 0%{?with_python3} +BuildArch: noarch BuildRequires: python3-devel python3-pytest BuildRequires: python3-setuptools -BuildRequires: python3-sqlalchemy python3-zmq -%endif -BuildRequires: python2-setuptools +BuildRequires: python3-sqlalchemy python3-zmq python3-brotli +%{?python_enable_dependency_generator} %global _description\ Logbook is a logging system for Python that replaces the standard library’s\ logging module. It was designed with both complex and simple applications\ @@ -43,16 +28,8 @@ Logbook can do that.\ %description %_description -%package -n python2-logbook -Summary: %summary -%{?python_provide:%python_provide python2-logbook} - -%description -n python2-logbook %_description - -%if 0%{?with_python3} %package -n python3-logbook Summary: A logging replacement for Python 3 -Group: Development/Libraries %description -n python3-logbook Logbook is a logging system for Python that replaces the standard library’s @@ -62,63 +39,29 @@ getting log messages on your phone or desktop notification system? Logbook can do that. This package allows for use of logger with Python 3. -%endif # with_python3 %prep %setup -qn Logbook-%{version} - -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif # with_python3 - %build -CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build - -%if 0%{?with_python3} -pushd %{py3dir} -CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build -popd -%endif # with_python3 +%py3_build %install -rm -rf %{buildroot} -# Must do the python3 install first because the scripts in /usr/bin are -# overwritten with every setup.py install (and we want the python2 version -# to be the default for now). -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install --skip-build --root %{buildroot} -popd -%endif # with_python3 - -%{__python2} setup.py install --skip-build --root %{buildroot} \ - --install-data=%{_datadir} - -#%check -#%{__python} setup.py test -#%if 0%{?with_python3} -#pushd %{py3dir} -#%{__python3} setup.py test -#popd -#%endif # with_python3 - -%files -n python2-logbook -%doc CHANGES -%{python2_sitearch}/logbook* -#%%exclude %%{python2_sitearch}/logbook/testsuite -%{python2_sitearch}/Logbook-%{version}-py2.7.egg-info/ +%py3_install + +#%%check +#%%{__python3} setup.py test -%if 0%{?with_python3} %files -n python3-logbook %doc CHANGES -%{python3_sitearch}/logbook* +%{python3_sitelib}/logbook* #%%exclude %%{python3_sitearch}/logbook/testsuite -%{python3_sitearch}/Logbook-%{version}-py%{python3_version}.egg-info/ -%endif +%{python3_sitelib}/Logbook-%{version}-py%{python3_version}.egg-info/ %changelog +* Thu Oct 04 2018 Gwyn Ciesla - 1.4.0-1 +- Drop python2, 1.4.0 + * Sat Jul 14 2018 Fedora Release Engineering - 1.0.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 1091a71..9a12cbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22fea705e067c118925898f0c30b0508 Logbook-1.0.0.tar.gz +SHA512 (Logbook-1.4.0.tar.gz) = 94720067039f590528c6be099c11681b409f363cd66597e757090ccf6382ef43bcfb76c73318c5e4df6eccf36d8b75517cd5f35b478fc01c13ddf458a512d8cf