diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index 090a220..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -sed 's,build_for_python3 0,build_for_python3 1,;s,^\(Name: *\)python-,\1python3-,' python-setuptools-git.spec > python3-setuptools-git.spec -cp python-setuptools-git.changes python3-setuptools-git.changes diff --git a/python-setuptools-git.changes b/python-setuptools-git.changes index ae550d4..8015dca 100644 --- a/python-setuptools-git.changes +++ b/python-setuptools-git.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat May 16 13:26:27 UTC 2015 - p.drouand@gmail.com + +- Remove obsolete hacks of when python2 and 3 specfiles where in the + place + +------------------------------------------------------------------- +Tue May 12 15:46:14 UTC 2015 - benoit.monin@gmx.fr + +- update to version 1.1: + * no changelog available +- add test dependency git-core +- run the tests during build + ------------------------------------------------------------------- Thu Oct 24 11:14:18 UTC 2013 - speilicke@suse.com diff --git a/python-setuptools-git.spec b/python-setuptools-git.spec index 44f65a5..093e6e5 100644 --- a/python-setuptools-git.spec +++ b/python-setuptools-git.spec @@ -1,7 +1,7 @@ # # spec file for package python-setuptools-git # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,16 @@ %define mod_name setuptools-git -%define build_for_python3 0 Name: python-setuptools-git -Version: 1.0b1 +Version: 1.1 Release: 0 Summary: Setuptools revision control system plugin for Git License: BSD-3-Clause Group: Development/Languages/Python Url: https://github.com/wichert/setuptools-git Source: http://pypi.python.org/packages/source/s/setuptools-git/setuptools-git-%{version}.tar.gz -%if %{build_for_python3} -BuildRequires: python -BuildRequires: python3-devel -BuildRequires: python3-distribute -Requires: python -BuildArch: noarch -%else +BuildRequires: git-core BuildRequires: python-devel BuildRequires: python-setuptools %if 0%{?suse_version} && 0%{?suse_version} <= 1110 @@ -41,17 +34,8 @@ BuildRequires: python-setuptools %else BuildArch: noarch %endif -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{build_for_python3} -%define local_python python3 -%define local_sitelib %{python3_sitelib} -%else -%define local_python python -%define local_sitelib %{python_sitelib} -%endif - %description This is a plugin for setuptools that enables git integration. Once installed, Setuptools can be told to include in a package distribution @@ -66,13 +50,19 @@ uniform naming convention. %setup -q -n setuptools-git-%{version} %build -%{local_python} setup.py build +python setup.py build %install -%{local_python} setup.py install --prefix=%{_prefix} --root=%{buildroot} +python setup.py install --prefix=%{_prefix} --root=%{buildroot} + +%check +# configure git for the test +git config --global user.email "test@test.test" +git config --global user.name "test" +python setup.py -q test %files %defattr(-,root,root,-) -%{local_sitelib}/* +%{python_sitelib}/* %changelog diff --git a/setuptools-git-1.0b1.tar.gz b/setuptools-git-1.0b1.tar.gz deleted file mode 100644 index 56dee60..0000000 --- a/setuptools-git-1.0b1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dccd496b4166315c2b6b842f3dcd417b22e2cb43aaa4a8983b1ea0ceae0fe328 -size 8570 diff --git a/setuptools-git-1.1.tar.gz b/setuptools-git-1.1.tar.gz new file mode 100644 index 0000000..5738928 --- /dev/null +++ b/setuptools-git-1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:047d7595546635edebef226bc566579d422ccc48a8a91c7d32d8bd174f68f831 +size 9450