Project import/python-setuptools - Diff 658dc830ee...745d86c789

... ... --- a/.abf.yml
... ... +++ b/.abf.yml
... ... @@ -2,5 +2,7 @@ removed_sources:
2 2
  setuptools-18.3.2.tar.gz: 7a0c0f378dcb6ffcb863ccd9503a647ff4ad3ae9
3 3
  setuptools-18.6.1.tar.gz: 41eee1b307e0bae8c04ce43eed3652453da68e5f
4 4
  setuptools-3.6.tar.gz: 745cbb942f8015dbcbfd9df5cb815adb63c7b0e9
5
sources:
6 5
  setuptools-38.2.5.tar.gz: e929531d068f765fbdbb68e0f7138c09345fcc0b
6
  setuptools-38.4.0.tar.gz: 35eec496c5e49a2000a3ce7dee4265ebe6b2e114
7
sources:
8
  setuptools-38.5.1.zip: 58ae000003aa99a1fbfc0ec1b15d5f2be74f49e5
view file @ 745d86c789
... ... --- a/python-setuptools.spec
... ... +++ b/python-setuptools.spec
... ... @@ -10,21 +10,21 @@
10 10
%bcond_without python3
11 11
12 12
%if %{with wheel}
13
%define python2_wheelname %{module}-%{version}.post*-py2.py3-none-any.whl
14
%define python2_record %{py_puresitedir}/%{module}-%{version}.post*.dist-info/RECORD
13
%define python2_wheelname %{module}-%{version}*-py2.py3-none-any.whl
14
%define python2_record %{py_puresitedir}/%{module}-%{version}*.dist-info/RECORD
15 15
%define python3_wheelname %{python2_wheelname}
16
%define python3_record %{py3_puresitedir}/%{module}-%{version}.post*.dist-info/RECORD
16
%define python3_record %{py3_puresitedir}/%{module}-%{version}*.dist-info/RECORD
17 17
%endif
18 18
 
19 19
Summary:	Easily build and distribute Python packages
20 20
Name:		python-%{module}
21
Version:	38.2.5
21
Version:	38.5.1
22 22
Release:	1
23 23
Epoch:		1
24 24
License:	Python or ZPLv2.0
25 25
Group:		Development/Python
26 26
Url:		http://pypi.python.org/pypi/%{module}
27
Source0:        https://github.com/pypa/setuptools/archive/%{version}%{?rctag:%{rctag}}/%{module}-%{version}%{?rctag:%{rctag}}.tar.gz
27
Source0:        https://files.pythonhosted.org/packages/source/s/%{module}/%{module}-%{version}%{?rctag:%{rctag}}.zip
28 28
BuildArch:	noarch
29 29
BuildRequires:	python-devel
30 30
%if %{with wheel}
... ... @@ -36,7 +36,7 @@ Provides: pythonegg(distribute)
36 36
37 37
# For unittests
38 38
BuildRequires:	subversion
39
Requires:	python-pkg-resources
39
Requires:	python-pkg-resources >= %{version}
40 40
41 41
%rename		python-setuptools-devel
42 42
%rename		python-distribute
... ... @@ -67,7 +67,7 @@ BuildRequires: python3-wheel
67 67
%endif
68 68
Provides:	python3egg(setuptools)
69 69
Provides:	python3egg(distribute)
70
Requires:	python3-pkg-resources
70
Requires:	python3-pkg-resources >= %{version}
71 71
72 72
%rename		python3-setuptools-devel
73 73
%rename		python3-distribute
... ... @@ -107,6 +107,7 @@ popd
107 107
%endif
108 108
109 109
%build
110
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
110 111
pushd python2
111 112
python bootstrap.py
112 113
%if %{with wheel}
... ... @@ -150,7 +151,6 @@ rm -rf %{buildroot}%{py3_puresitedir}/setuptools/tests
151 151
sed -i '/^setuptools\/tests\//d' %{buildroot}%{python3_record}
152 152
%endif
153 153
154
find %{buildroot}%{py3_puresitedir} -name '*.exe' | xargs rm -f
155 154
chmod +x %{buildroot}%{py3_puresitedir}/setuptools/command/easy_install.py
156 155
popd
157 156
... ... @@ -168,7 +168,6 @@ rm -rf %{buildroot}%{py_puresitedir}/setuptools/tests
168 168
sed -i '/^setuptools\/tests\//d' %{buildroot}%{python2_record}
169 169
%endif
170 170
171
find %{buildroot}%{py_puresitedir} -name '*.exe' | xargs rm -f
172 171
chmod +x %{buildroot}%{py_puresitedir}/setuptools/command/easy_install.py
173 172
popd
174 173