[hg-git/el6: 3/3] Merge branch 'master' into el6

[Christopher Meng]

commit 6f043a448b080f147dab1a5f2e8463137e37dc6b
Merge: 92f00a9 02b50a0
Author: Christopher Meng <i at cicku.me>
Date:   Tue Aug 5 14:55:53 2014 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	hg-git.spec

 .gitignore  |    1 +
 hg-git.spec |   12 +++++++++---
 sources     |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --cc hg-git.spec
index 48542ea,8fdf271..5b73106
--- a/hg-git.spec
+++ b/hg-git.spec
@@@ -27,20 -27,26 +27,26 @@@ identical - Mercurial data does not ge
  
  %prep
  %setup -q
- rm -rf *.egg-info
+ rm -frv *.egg-info
  
  %build
 -%{__python2} setup.py build
 +%{__python} setup.py build
  
  %install
 -%{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
 +%{__python} setup.py install -O1 --skip-build --root=%{buildroot}
  
  %files
- #%doc COPYING DESIGN.txt README.md TODO.txt
+ %doc COPYING README.md
 -%{python2_sitelib}/hggit/
 -%{python2_sitelib}/*.egg-info/
 +%{python_sitelib}/hggit/
 +%{python_sitelib}/*.egg-info/
  
  %changelog
+ * Tue Aug 05 2014 Christopher Meng <rpm at cicku.me> - 0.6.1-1
+ - Update to 0.6.1
+ 
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Thu May 22 2014 Christopher Meng <rpm at cicku.me> - 0.6.0-1
  - Update to 0.6.0