diff --git a/.gitignore b/.gitignore index d6c825f..a4cf827 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /colander-0.9.9.tar.gz /colander-1.0a2.tar.gz /colander-1.0b1.tar.gz +/colander-1.2.tar.gz diff --git a/python-colander.spec b/python-colander.spec index 80f519c..a18d1d1 100644 --- a/python-colander.spec +++ b/python-colander.spec @@ -5,8 +5,8 @@ %global modname colander Name: python-colander -Version: 1.0b1 -Release: 6%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: A simple schema-based serialization and deserialization library Group: Development/Libraries @@ -19,16 +19,16 @@ BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools +BuildRequires: python2-iso8601 BuildRequires: python-translationstring BuildRequires: python-nose BuildRequires: python-coverage -Requires: python-translationstring - %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: python3-iso8601 BuildRequires: python3-translationstring BuildRequires: python3-nose @@ -46,12 +46,31 @@ An extensible package which can be used to: Please see http://docs.pylonsproject.org/projects/colander/en/latest/ for further documentation. +%package -n python2-colander +Summary: A simple schema-based serialization and deserialization library +%{?python_provide:%python_provide python2-colander} + +Requires: python-translationstring +Requires: python2-iso8601 + +%description -n python2-colander +An extensible package which can be used to: + +- deserialize and validate a data structure composed of strings, mappings, + and lists. +- serialize an arbitrary data structure to a data structure composed of + strings, mappings, and lists. + +Please see http://docs.pylonsproject.org/projects/colander/en/latest/ for +further documentation. + %if 0%{?with_python3} %package -n python3-colander Summary: A simple schema-based serialization and deserialization library -Group: Development/Libraries +%{?python_provide:%python_provide python3-colander} Requires: python3-translationstring +Requires: python3-iso8601 %description -n python3-colander An extensible package which can be used to: @@ -63,7 +82,6 @@ An extensible package which can be used to: Please see http://docs.pylonsproject.org/projects/colander/en/latest/ for further documentation. - %endif %prep @@ -75,48 +93,44 @@ rm -rf docs/.static # Remove bundled egg-info in case it exists rm -rf %{modname}.egg-info -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif %build -%{__python} setup.py build +%py2_build %if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd +%py3_build %endif %install +%py2_install %if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install -O1 --skip-build --root=%{buildroot} -popd +%py3_install %endif -%{__python} setup.py install -O1 --skip-build --root=%{buildroot} %check -%{__python} setup.py test +%{__python2} setup.py test %if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py test -popd %endif -%files -%doc README.txt LICENSE.txt COPYRIGHT.txt CONTRIBUTORS.txt CHANGES.txt docs -%{python_sitelib}/%{modname}/ -%{python_sitelib}/%{modname}-%{version}* +%files -n python2-%{modname} +%doc README.rst LICENSE.txt COPYRIGHT.txt CONTRIBUTORS.txt CHANGES.rst docs +%{python2_sitelib}/%{modname}/ +%{python2_sitelib}/%{modname}-%{version}* %if 0%{?with_python3} %files -n python3-%{modname} -%doc README.txt LICENSE.txt COPYRIGHT.txt CONTRIBUTORS.txt CHANGES.txt docs +%doc README.rst LICENSE.txt COPYRIGHT.txt CONTRIBUTORS.txt CHANGES.rst docs %{python3_sitelib}/%{modname}/ %{python3_sitelib}/%{modname}-%{version}-* %endif %changelog +* Mon Apr 04 2016 Ralph Bean - 1.2-1 +- New version +- New dep on python-iso8601 +- Fixed doc paths for new upstream. +- Modernized python macros. + * Thu Feb 04 2016 Fedora Release Engineering - 1.0b1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 530fbb0..d505f75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89f2cf4b5c87d43f7917d6a0d4872e6a colander-1.0b1.tar.gz +83db21b07936a0726e588dae1914b9ed colander-1.2.tar.gz