Merge branch 'master' into f12

Conflicts:
	.gitignore
	python-pip.spec
	sources
This commit is contained in:
Peter Halliday 2010-08-31 18:09:50 -04:00
commit 05b65b4ac6
3 changed files with 13 additions and 7 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
pip-0.7.2.tar.gz pip-0.7.2.tar.gz
/pip-0.8.tar.gz

View File

@ -3,7 +3,7 @@
%global srcname pip %global srcname pip
Name: python-%{srcname} Name: python-%{srcname}
Version: 0.7.2 Version: 0.8
Release: 1%{?dist} Release: 1%{?dist}
Summary: Pip installs packages. Python packages. An easy_install replacement Summary: Pip installs packages. Python packages. An easy_install replacement
@ -37,6 +37,8 @@ pip is meant to improve on easy_install.bulletin boards, etc.).
%install %install
%{__rm} -rf %{buildroot} %{__rm} -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot}
%{__rm} -rf %{buildroot}%{_bindir}/pip-*
mv %{buildroot}%{_bindir}/pip %{buildroot}%{_bindir}/pip-python
%clean %clean
%{__rm} -rf %{buildroot} %{__rm} -rf %{buildroot}
@ -44,17 +46,20 @@ pip is meant to improve on easy_install.bulletin boards, etc.).
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc PKG-INFO docs %doc PKG-INFO docs
%attr(755,root,root) %{_bindir}/pip %attr(755,root,root) %{_bindir}/pip-python
%{python_sitelib}/pip* %{python_sitelib}/pip*
%changelog %changelog
* Mon Aug 30 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.8-1
- update to 0.8 of pip
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.7.2-5
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Wed Jul 7 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.7.2-1 * Wed Jul 7 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.7.2-1
- update to 0.7.2 of pip - update to 0.7.2 of pip
* Sat May 22 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.7.1-1 * Sun May 23 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.7.1-1
- update to 0.7.1 of pip - update to 0.7.1 of pip
* Sat Mar 5 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.3-1 * Fri Jan 1 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1.4
- update to 0.6.3 of pip
* Fri Jan 1 2010 Peter Halliday <phalliday@excelsiorssytems.net> - 0.6.1.4
- fix dependency issue - fix dependency issue
* Tue Dec 18 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-2 * Tue Dec 18 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-2
- fix spec file - fix spec file

View File

@ -1 +1 @@
cfe73090aaa0d3b0c104179a627859d1 pip-0.7.2.tar.gz 468d9adc309f33ad51cee38f0d455429 pip-0.8.tar.gz