From a89d58b356be1850c98ef30f6beef5cd20274d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 7 Jun 2014 15:25:12 +0200 Subject: [PATCH 1/9] Make this for Python 3.5 only --- python-pip.spec | 98 +++++++++---------------------------------------- 1 file changed, 17 insertions(+), 81 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index e6d032e..96d785a 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -1,23 +1,14 @@ -%if (! 0%{?rhel}) || 0%{?rhel} > 6 -%global with_python3 1 -%global build_wheel 1 -%endif -%if 0%{?rhel} && 0%{?rhel} < 6 -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%endif +%global build_wheel 0 %global srcname pip %if 0%{?build_wheel} -%global python2_wheelname %{srcname}-%{version}-py2.py3-none-any.whl -%if 0%{?with_python3} -%global python3_wheelname %python2_wheelname -%endif +%global python3_wheelname %{srcname}-%{version}-py2.py3-none-any.whl %endif -Name: python-%{srcname} +Name: python35-%{srcname} Version: 1.5.6 Release: 1%{?dist} -Summary: A tool for installing and managing Python packages +Summary: A tool for installing and managing Python 3 packages Group: Development/Libraries License: MIT @@ -27,13 +18,13 @@ Patch0: pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel -BuildRequires: python-setuptools +BuildRequires: python35-devel +BuildRequires: python35-setuptools %if 0%{?build_wheel} -BuildRequires: python-pip -BuildRequires: python-wheel +BuildRequires: python35-pip +BuildRequires: python35-wheel %endif -Requires: python-setuptools +Requires: python35-setuptools %description Pip is a replacement for `easy_install @@ -41,27 +32,6 @@ Pip is a replacement for `easy_install same techniques for finding packages, so packages that were made easy_installable should be pip-installable as well. - -%if 0%{?with_python3} -%package -n python3-pip -Summary: A tool for installing and managing Python3 packages -Group: Development/Libraries - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -%if 0%{?build_wheel} -BuildRequires: python3-pip -BuildRequires: python3-wheel -%endif -Requires: python3-setuptools - -%description -n python3-pip -Pip is a replacement for `easy_install -`_. It uses mostly the -same techniques for finding packages, so packages that were made -easy_installable should be pip-installable as well. -%endif # with_python3 - %prep %setup -q -n %{srcname}-%{version} @@ -69,50 +39,25 @@ easy_installable should be pip-installable as well. %{__sed} -i '1d' pip/__init__.py -%if 0%{?with_python3} -cp -a . %{py3dir} -%endif # with_python3 - - %build %if 0%{?build_wheel} -%{__python} setup.py bdist_wheel +%{__python35} setup.py bdist_wheel %else -%{__python} setup.py build +%{__python35} setup.py build %endif -%if 0%{?with_python3} -pushd %{py3dir} -%if 0%{?build_wheel} -%{__python3} setup.py bdist_wheel -%else -%{__python3} setup.py build -%endif -popd -%endif # with_python3 - %install %{__rm} -rf %{buildroot} -%if 0%{?with_python3} -pushd %{py3dir} %if 0%{?build_wheel} pip3 install -I dist/%{python3_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot} -# TODO: we have to remove this by hand now, but it'd be nice if we wouldn't have to -# (pip install wheel doesn't overwrite) +%else +%{__python35} setup.py install --skip-build --root %{buildroot} +%endif + rm %{buildroot}%{_bindir}/pip -%else -%{__python3} setup.py install --skip-build --root %{buildroot} -%endif -%endif # with_python3 - -%if 0%{?build_wheel} -pip2 install -I dist/%{python2_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot} -%else -%{__python} setup.py install -O1 --skip-build --root %{buildroot} -%endif - +rm %{buildroot}%{_bindir}/pip3 %clean %{__rm} -rf %{buildroot} @@ -123,17 +68,8 @@ pip2 install -I dist/%{python2_wheelname} --root %{buildroot} --strip-file-prefi %files %defattr(-,root,root,-) %doc LICENSE.txt README.rst docs -%attr(755,root,root) %{_bindir}/pip -%attr(755,root,root) %{_bindir}/pip2* -%{python_sitelib}/pip* - -%if 0%{?with_python3} -%files -n python3-pip -%defattr(-,root,root,-) -%doc LICENSE.txt README.rst docs %attr(755,root,root) %{_bindir}/pip3* -%{python3_sitelib}/pip* -%endif # with_python3 +%{python35_sitelib}/pip* %changelog * Sun May 25 2014 Matej Stuchlik - 1.5.6-1 From 9786f82445fef0241e727ae5e305eba0e79e6bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 7 Jun 2014 16:18:32 +0200 Subject: [PATCH 2/9] Python nightly build bootstraping --- python-pip.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 96d785a..4fa3a8f 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -1,4 +1,4 @@ -%global build_wheel 0 +%global build_wheel 1 %global srcname pip %if 0%{?build_wheel} @@ -7,7 +7,7 @@ Name: python35-%{srcname} Version: 1.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool for installing and managing Python 3 packages Group: Development/Libraries @@ -51,7 +51,7 @@ easy_installable should be pip-installable as well. %{__rm} -rf %{buildroot} %if 0%{?build_wheel} -pip3 install -I dist/%{python3_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot} +pip3.5 install -I dist/%{python3_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot} %else %{__python35} setup.py install --skip-build --root %{buildroot} %endif @@ -72,6 +72,9 @@ rm %{buildroot}%{_bindir}/pip3 %{python35_sitelib}/pip* %changelog +* Sat Jun 07 2014 Miro Hrončok - 1.5.6-2 +- Bootstraping + * Sun May 25 2014 Matej Stuchlik - 1.5.6-1 - Update to 1.5.6 From 0771ae659ccd4cfc2ed929e8f1476b01c5e31537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 7 Jun 2014 17:21:04 +0200 Subject: [PATCH 3/9] Allow nighly rebuilds of pip as well --- python-pip.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 4fa3a8f..a1752cb 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -6,14 +6,14 @@ %endif Name: python35-%{srcname} -Version: 1.5.6 -Release: 2%{?dist} +Version: 1.6 +Release: 0.1.20140607git3eaea35f%{?dist} Summary: A tool for installing and managing Python 3 packages Group: Development/Libraries License: MIT URL: http://www.pip-installer.org -Source0: http://pypi.python.org/packages/source/p/pip/%{srcname}-%{version}.tar.gz +Source0: python3-nightly-pip-3eaea35f.tar Patch0: pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,7 +33,7 @@ same techniques for finding packages, so packages that were made easy_installable should be pip-installable as well. %prep -%setup -q -n %{srcname}-%{version} +%setup -q -n python3-nightly-%{srcname} %patch0 -p1 @@ -72,6 +72,9 @@ rm %{buildroot}%{_bindir}/pip3 %{python35_sitelib}/pip* %changelog +* Sat Jun 07 2014 Miro Hrončok - 1.6-0.1.20140607git3eaea35f +- Update to git: 3eaea35f + * Sat Jun 07 2014 Miro Hrončok - 1.5.6-2 - Bootstraping @@ -150,7 +153,7 @@ rm %{buildroot}%{_bindir}/pip3 * Fri Jan 1 2010 Peter Halliday - 0.6.1.4 - fix dependency issue * Fri Dec 18 2009 Peter Halliday - 0.6.1-2 -- fix spec file +- fix spec file * Thu Dec 17 2009 Peter Halliday - 0.6.1-1 - upgrade to 0.6.1 of pip * Mon Aug 31 2009 Peter Halliday - 0.4-1 From 61ab0cd65d95f0782ec319f689f448dc9dd60c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 7 Jun 2014 18:18:53 +0200 Subject: [PATCH 4/9] Update the patch to git version --- ...pping-prefix-from-wheel-RECORD-files.patch | 48 ++++++++----------- python-pip.spec | 2 +- 2 files changed, 22 insertions(+), 28 deletions(-) rename pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch => pip-1.6-allow-stripping-prefix-from-wheel-RECORD-files.patch (69%) diff --git a/pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch b/pip-1.6-allow-stripping-prefix-from-wheel-RECORD-files.patch similarity index 69% rename from pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch rename to pip-1.6-allow-stripping-prefix-from-wheel-RECORD-files.patch index f2e8487..0d12952 100644 --- a/pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch +++ b/pip-1.6-allow-stripping-prefix-from-wheel-RECORD-files.patch @@ -1,15 +1,14 @@ -commit aefacbb76661520415a1c35028f2984e70cfe0bf Author: Slavek Kabrda Date: Fri Nov 29 13:24:58 2013 +0100 Allow stripping given prefix from wheel RECORD files diff --git a/pip/commands/install.py b/pip/commands/install.py -index 1693d01..0287c06 100644 +index 20b54b9..b421d1b 100644 --- a/pip/commands/install.py +++ b/pip/commands/install.py -@@ -137,6 +137,14 @@ class InstallCommand(Command): - help="Install everything relative to this alternate root directory.") +@@ -132,6 +132,14 @@ class InstallCommand(Command): + "directory.") cmd_opts.add_option( + '--strip-file-prefix', @@ -23,24 +22,19 @@ index 1693d01..0287c06 100644 "--compile", action="store_true", dest="compile", -@@ -273,7 +281,11 @@ class InstallCommand(Command): - requirement_set.locate_files() - - if not options.no_install and not self.bundle: -- requirement_set.install(install_options, global_options, root=options.root_path) -+ requirement_set.install( -+ install_options, -+ global_options, -+ root=options.root_path, -+ strip_file_prefix=options.strip_file_prefix) +@@ -311,6 +319,7 @@ class InstallCommand(Command): + install_options, + global_options, + root=options.root_path, ++ strip_file_prefix=options.strip_file_prefix, + ) installed = ' '.join([req.name for req in requirement_set.successfully_installed]) - if installed: -diff --git a/pip/req.py b/pip/req.py -index 3ae306d..c171130 100644 ---- a/pip/req.py -+++ b/pip/req.py -@@ -615,15 +615,19 @@ exec(compile(open(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec')) +diff --git a/pip/req/req_install.py b/pip/req/req_install.py +index 6ec2a42..ac2f213 100644 +--- a/pip/req/req_install.py ++++ b/pip/req/req_install.py +@@ -709,7 +709,7 @@ exec(compile( name = name.replace(os.path.sep, '/') return name @@ -49,7 +43,7 @@ index 3ae306d..c171130 100644 if self.editable: self.install_editable(install_options, global_options) return - if self.is_wheel: +@@ -717,7 +717,11 @@ exec(compile( version = pip.wheel.wheel_version(self.source_dir) pip.wheel.check_compatibility(version, self.name) @@ -62,9 +56,9 @@ index 3ae306d..c171130 100644 self.install_succeeded = True return -@@ -844,13 +848,14 @@ exec(compile(open(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec')) - self._bundle_build_dirs = bundle_build_dirs - self._bundle_editable_dirs = bundle_editable_dirs +@@ -912,13 +916,14 @@ exec(compile( + def is_wheel(self): + return self.url and '.whl' in self.url - def move_wheel_files(self, wheeldir, root=None): + def move_wheel_files(self, wheeldir, root=None, strip_file_prefix=None): @@ -79,10 +73,10 @@ index 3ae306d..c171130 100644 @property diff --git a/pip/wheel.py b/pip/wheel.py -index fa3e270..3a366d0 100644 +index 2d4f4df..78a99e9 100644 --- a/pip/wheel.py +++ b/pip/wheel.py -@@ -136,7 +136,7 @@ def get_entrypoints(filename): +@@ -127,7 +127,7 @@ def get_entrypoints(filename): def move_wheel_files(name, req, wheeldir, user=False, home=None, root=None, @@ -91,7 +85,7 @@ index fa3e270..3a366d0 100644 """Install a wheel""" if not scheme: -@@ -357,6 +357,8 @@ if __name__ == '__main__': +@@ -365,6 +365,8 @@ if __name__ == '__main__': writer.writerow(row) for f in generated: h, l = rehash(f) diff --git a/python-pip.spec b/python-pip.spec index a1752cb..c8d5524 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -14,7 +14,7 @@ Group: Development/Libraries License: MIT URL: http://www.pip-installer.org Source0: python3-nightly-pip-3eaea35f.tar -Patch0: pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch +Patch0: pip-1.6-allow-stripping-prefix-from-wheel-RECORD-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From 4425f8db4acd9beedbc716746c33d24fd225eb98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 7 Jun 2014 18:21:36 +0200 Subject: [PATCH 5/9] Be less sctrict in wheel version in filename --- python-pip.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-pip.spec b/python-pip.spec index c8d5524..78459e9 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -2,7 +2,7 @@ %global srcname pip %if 0%{?build_wheel} -%global python3_wheelname %{srcname}-%{version}-py2.py3-none-any.whl +%global python3_wheelname %{srcname}-*-py2.py3-none-any.whl %endif Name: python35-%{srcname} From 5e67d56d2d8918f02945d8f53f7e709d9025b9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 27 Jun 2014 19:46:57 +0200 Subject: [PATCH 6/9] SCL --- python-pip.spec | 140 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 111 insertions(+), 29 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 78459e9..4ef3848 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -1,30 +1,42 @@ -%global build_wheel 1 +%global with_python2 0 +%global with_python3 1 +%global build_wheel 0 %global srcname pip + +%{?scl:%scl_package python-%{srcname}} +%{!?scl:%global pkg_name %{name}} +%{?scl:%global py3dir %{_builddir}/python3-%{name}-%{version}-%{release}} + %if 0%{?build_wheel} -%global python3_wheelname %{srcname}-*-py2.py3-none-any.whl +%global python2_wheelname %{srcname}-*-py2.py3-none-any.whl +%if 0%{?with_python3} +%global python3_wheelname %python2_wheelname +%endif %endif -Name: python35-%{srcname} +Name: %{?scl_prefix}python-%{srcname} Version: 1.6 -Release: 0.1.20140607git3eaea35f%{?dist} -Summary: A tool for installing and managing Python 3 packages +Release: 0.3.20140626gitbb6c11ed%{?dist} +Summary: A tool for installing and managing Python packages Group: Development/Libraries License: MIT URL: http://www.pip-installer.org -Source0: python3-nightly-pip-3eaea35f.tar +Source0: python3-nightly-pip-bb6c11ed.tar Patch0: pip-1.6-allow-stripping-prefix-from-wheel-RECORD-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python35-devel -BuildRequires: python35-setuptools +%if 0%{?with_python2} +BuildRequires: python-devel +BuildRequires: python-setuptools %if 0%{?build_wheel} -BuildRequires: python35-pip -BuildRequires: python35-wheel +BuildRequires: python-pip +BuildRequires: python-wheel %endif -Requires: python35-setuptools +Requires: python-setuptools +%endif # with_python2 %description Pip is a replacement for `easy_install @@ -32,6 +44,27 @@ Pip is a replacement for `easy_install same techniques for finding packages, so packages that were made easy_installable should be pip-installable as well. + +%if 0%{?with_python3} +%package -n %{?scl_prefix}python3-%{srcname} +Summary: A tool for installing and managing Python3 packages +Group: Development/Libraries + +BuildRequires: %{?scl_prefix}python3-devel +BuildRequires: %{?scl_prefix}python3-setuptools +%if 0%{?build_wheel} +BuildRequires: %{?scl_prefix}python3-pip +BuildRequires: %{?scl_prefix}python3-wheel +%endif +Requires: %{?scl_prefix}python3-setuptools + +%description -n %{?scl_prefix}python3-%{srcname} +Pip is a replacement for `easy_install +`_. It uses mostly the +same techniques for finding packages, so packages that were made +easy_installable should be pip-installable as well. +%endif # with_python3 + %prep %setup -q -n python3-nightly-%{srcname} @@ -39,25 +72,60 @@ easy_installable should be pip-installable as well. %{__sed} -i '1d' pip/__init__.py -%build -%if 0%{?build_wheel} -%{__python35} setup.py bdist_wheel -%else -%{__python35} setup.py build -%endif +%if 0%{?with_python3} +cp -a . %{py3dir} +%endif # with_python3 +%build +%{?scl:scl enable %scl - << \EOF} +%if 0%{?with_python2} +%if 0%{?build_wheel} +%{__python2} setup.py bdist_wheel +%else +%{__python2} setup.py build +%endif +%endif # with_python2 + +%if 0%{?with_python3} +pushd %{py3dir} +%if 0%{?build_wheel} +%{__python3} setup.py bdist_wheel +%else +%{__python3} setup.py build +%endif +popd +%endif # with_python3 +%{?scl:EOF} + %install %{__rm} -rf %{buildroot} +%{?scl:scl enable %scl - << \EOF} +%if 0%{?with_python3} +pushd %{py3dir} %if 0%{?build_wheel} -pip3.5 install -I dist/%{python3_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot} -%else -%{__python35} setup.py install --skip-build --root %{buildroot} -%endif +pip3 install -I dist/%{python3_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot} +%if 0%{?with_python2} +# TODO: we have to remove this by hand now, but it'd be nice if we wouldn't have to +# (pip install wheel doesn't overwrite) rm %{buildroot}%{_bindir}/pip -rm %{buildroot}%{_bindir}/pip3 +%endif # with_python2 + +%else +%{__python3} setup.py install --skip-build --root %{buildroot} +%endif +%endif # with_python3 + +%if 0%{?with_python2} +%if 0%{?build_wheel} +pip2 install -I dist/%{python2_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot} +%else +%{__python} setup.py install -O1 --skip-build --root %{buildroot} +%endif +%endif # with_python2 +%{?scl:EOF} %clean %{__rm} -rf %{buildroot} @@ -65,18 +133,32 @@ rm %{buildroot}%{_bindir}/pip3 # unfortunately, pip's test suite requires virtualenv >= 1.6 which isn't in # fedora yet. Once it is, check can be implemented +%if 0%{?with_python2} %files %defattr(-,root,root,-) %doc LICENSE.txt README.rst docs +%attr(755,root,root) %{_bindir}/pip +%attr(755,root,root) %{_bindir}/pip2* +%{python_sitelib}/pip* +%endif # with_python2 + +%if 0%{?with_python3} +%files -n %{?scl_prefix}python3-%{srcname} +%defattr(-,root,root,-) +%doc LICENSE.txt README.rst docs %attr(755,root,root) %{_bindir}/pip3* -%{python35_sitelib}/pip* +%{python3_sitelib}/pip* + +%if ! 0%{?with_python2} +%attr(755,root,root) %{_bindir}/pip +%endif # ! with_python2 + +%endif # with_python3 %changelog -* Sat Jun 07 2014 Miro Hrončok - 1.6-0.1.20140607git3eaea35f -- Update to git: 3eaea35f - -* Sat Jun 07 2014 Miro Hrončok - 1.5.6-2 -- Bootstraping +* Thu Jun 26 2014 Miro Hrončok - 1.6-0.3.20140626gitbb6c11ed +- Update to git: bb6c11ed +- SCL * Sun May 25 2014 Matej Stuchlik - 1.5.6-1 - Update to 1.5.6 @@ -153,7 +235,7 @@ rm %{buildroot}%{_bindir}/pip3 * Fri Jan 1 2010 Peter Halliday - 0.6.1.4 - fix dependency issue * Fri Dec 18 2009 Peter Halliday - 0.6.1-2 -- fix spec file +- fix spec file * Thu Dec 17 2009 Peter Halliday - 0.6.1-1 - upgrade to 0.6.1 of pip * Mon Aug 31 2009 Peter Halliday - 0.4-1 From 6aae47b6a06b5b79347b888d7f0410d7046d6a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 27 Jun 2014 21:13:22 +0200 Subject: [PATCH 7/9] Bootstrapping --- python-pip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 4ef3848..46e52c3 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -1,6 +1,6 @@ %global with_python2 0 %global with_python3 1 -%global build_wheel 0 +%global build_wheel 1 %global srcname pip @@ -17,7 +17,7 @@ Name: %{?scl_prefix}python-%{srcname} Version: 1.6 -Release: 0.3.20140626gitbb6c11ed%{?dist} +Release: 0.4.20140626gitbb6c11ed%{?dist} Summary: A tool for installing and managing Python packages Group: Development/Libraries @@ -156,6 +156,9 @@ pip2 install -I dist/%{python2_wheelname} --root %{buildroot} --strip-file-prefi %endif # with_python3 %changelog +* Fri Jun 27 2014 Miro Hrončok - 1.6-0.4.20140626gitbb6c11ed +- Bootstrap + * Thu Jun 26 2014 Miro Hrončok - 1.6-0.3.20140626gitbb6c11ed - Update to git: bb6c11ed - SCL From 90a19b96ca6d27a476fc198d659bf21da25abf1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 1 Jul 2014 12:16:00 +0200 Subject: [PATCH 8/9] dgroc bump --- python-pip.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 46e52c3..2e69921 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -17,13 +17,13 @@ Name: %{?scl_prefix}python-%{srcname} Version: 1.6 -Release: 0.4.20140626gitbb6c11ed%{?dist} +Release: 0.5.20140701git6410ba43%{?dist} Summary: A tool for installing and managing Python packages Group: Development/Libraries License: MIT URL: http://www.pip-installer.org -Source0: python3-nightly-pip-bb6c11ed.tar +Source0: python3-nightly-pip-6410ba43.tar Patch0: pip-1.6-allow-stripping-prefix-from-wheel-RECORD-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -156,6 +156,9 @@ pip2 install -I dist/%{python2_wheelname} --root %{buildroot} --strip-file-prefi %endif # with_python3 %changelog +* Tue Jul 01 2014 Miro Hrončok - 1.6-0.5.20140701git6410ba43 +- Update to git: 6410ba43 + * Fri Jun 27 2014 Miro Hrončok - 1.6-0.4.20140626gitbb6c11ed - Bootstrap @@ -238,7 +241,7 @@ pip2 install -I dist/%{python2_wheelname} --root %{buildroot} --strip-file-prefi * Fri Jan 1 2010 Peter Halliday - 0.6.1.4 - fix dependency issue * Fri Dec 18 2009 Peter Halliday - 0.6.1-2 -- fix spec file +- fix spec file * Thu Dec 17 2009 Peter Halliday - 0.6.1-1 - upgrade to 0.6.1 of pip * Mon Aug 31 2009 Peter Halliday - 0.4-1 From f61b997d2f21b976e1d5457ca4ad342f0cd41d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 2 Jul 2014 00:02:52 +0200 Subject: [PATCH 9/9] dgroc bump --- python-pip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 2e69921..19b0dc8 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -17,13 +17,13 @@ Name: %{?scl_prefix}python-%{srcname} Version: 1.6 -Release: 0.5.20140701git6410ba43%{?dist} +Release: 0.6.20140702gitc720ca67%{?dist} Summary: A tool for installing and managing Python packages Group: Development/Libraries License: MIT URL: http://www.pip-installer.org -Source0: python3-nightly-pip-6410ba43.tar +Source0: python3-nightly-pip-c720ca67.tar Patch0: pip-1.6-allow-stripping-prefix-from-wheel-RECORD-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -156,6 +156,9 @@ pip2 install -I dist/%{python2_wheelname} --root %{buildroot} --strip-file-prefi %endif # with_python3 %changelog +* Wed Jul 02 2014 Miro Hrončok - 1.6-0.6.20140702gitc720ca67 +- Update to git: c720ca67 + * Tue Jul 01 2014 Miro Hrončok - 1.6-0.5.20140701git6410ba43 - Update to git: 6410ba43