diff --git a/.gitignore b/.gitignore index c5c1f33..48844bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /warlock-0.4.0.tar.gz +/warlock-1.0.1.tar.gz +/warlock-1.0.1-460080e.tar.gz diff --git a/python-warlock.spec b/python-warlock.spec index 365d7fe..f0453dc 100644 --- a/python-warlock.spec +++ b/python-warlock.spec @@ -1,11 +1,18 @@ +%global github_name warlock +%global commit 460080eb27fd8598c6b00f0df70e597058152323 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: python-warlock -Version: 0.4.0 -Release: 5%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Python object model built on top of JSON schema License: ASL 2.0 -URL: http://pypi.python.org/pypi/warlock/0.4.0 -Source0: http://pypi.python.org/packages/source/w/warlock/warlock-%{version}.tar.gz +URL: http://pypi.python.org/pypi/warlock +# pypi tarball does not contain LICENSE.txt +# TODO return pypi tarball when github.com/bcwaldon/warlock/pull/12 is done +Source0: https://github.com/bcwaldon/%{github_name}/archive/%{commit}/%{github_name}-%{version}-%{shortcommit}.tar.gz +#Source0: http://pypi.python.org/packages/source/w/warlock/warlock-%{version}.tar.gz BuildArch: noarch BuildRequires: python2-devel @@ -13,12 +20,15 @@ BuildRequires: python-setuptools Requires: python-jsonschema BuildRequires: python-jsonschema +Requires: python-jsonpatch +BuildRequires: python-jsonpatch %description Build self-validating python objects using JSON schemas %prep -%setup -q -n warlock-%{version} +%setup -qn %{github_name}-%{commit} + # Remove bundled egg-info rm -rf warlock.egg-info # let RPM handle deps @@ -35,11 +45,14 @@ rm -f requirements.txt %{__python} setup.py install --skip-build --root %{buildroot} %files -%doc README.md LICENSE +%doc README.md LICENSE.txt %{python_sitelib}/warlock %{python_sitelib}/warlock-%{version}-py?.?.egg-info %changelog +* Thu Oct 10 2013 Alan Pevec 1.0.1-1 +- update to 1.0.1 + * Tue Aug 13 2013 Alan Pevec 0.4.0-5 - fix FTBFS in rawhide rhbz#993177 diff --git a/sources b/sources index ef1ef3b..45efece 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd232322e891f1ccb8152e308dfdf558 warlock-0.4.0.tar.gz +de42194f73b3471a4d8aedd3922d440b warlock-1.0.1-460080e.tar.gz