[python-dulwich/el6: 7/7] Merge branch 'master' into el6

[Fabian Affolter]

commit a6e9cb33665cd9e9d900e685d8c1bb04c4684548
Merge: b1bff35 90fe5f4
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Mon Mar 23 23:16:29 2015 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	python-dulwich.spec

 .gitignore          |  3 +++
 python-dulwich.spec | 34 ++++++++++++++++++++++++++++++----
 sources             |  2 +-
 3 files changed, 34 insertions(+), 5 deletions(-)
---
diff --cc python-dulwich.spec
index a976436,8274771..35a0c52
--- a/python-dulwich.spec
+++ b/python-dulwich.spec
@@@ -12,9 -12,11 +12,10 @@@ License:        GPLv2+ or ASL 2.
  URL:            http://samba.org/~jelmer/dulwich/
  Source0:        https://pypi.python.org/packages/source/d/%{srcname}/%{srcname}-%{version}.tar.gz
  
--BuildRequires:  python2-devel
++BuildRequires:  python-devel
  BuildRequires:  python-setuptools
  BuildRequires:  python-nose
+ BuildRequires:  python-sphinx
 -BuildRequires:  python-docutils
  
  %if 0%{?rhel} < 7 || 0%{?fedora} < 14
  BuildRequires:  python-unittest2
@@@ -30,23 -32,44 +31,48 @@@ Mrs. Git live in the Monty Python sketc
  rm -rf %{srcname}.egg-info
  
  %build
 +CFLAGS="%{optflags}" %{__python} setup.py build
 +
 +%install
 +%{__python} setup.py install --skip-build --root %{buildroot}
+ CFLAGS="%{optflags}" %{__python2} setup.py build
+ pushd docs
+ # Not using {smp_flags} as sphinx fails with it from time to time
+ make html
+ popd
+ 
+ %install
 -%{__python2} setup.py install --skip-build --root %{buildroot}
++%{__python} setup.py install --skip-build --root %{buildroot}
+ # Remove extra copy of text docs
+ rm -rf docs/build/html/_sources
+ rm -f docs/build/html/{.buildinfo,objects.inv}
+ rm -rf %{buildroot}%{python2_sitearch}/docs/tutorial/
  
  #%check
  #cd dulwich/tests
  #nosetests test*.py
  
  %files
- %doc COPYING NEWS README.md docs/
+ %doc AUTHORS COPYING HACKING NEWS README.md docs/build/html
  %{_bindir}/dul-*
  %{_bindir}/%{srcname}
 -%{python2_sitearch}/%{srcname}*
 -%exclude %{python2_sitearch}/%{srcname}/tests*
 +%{python_sitearch}/%{srcname}*
 +%exclude %{python_sitearch}/%{srcname}/tests*
  
  %changelog
+ * Mon Mar 23 2015 Fabian Affolter <mail at fabian-affolter.ch> - 0.10.0-1
+ - Fix for CVE-2014-9706 (rhbz#1204889, rhbz#1204890, and rhbz#1204891)
+ - Update to new upstream version 0.10.0
+ 
+ * Mon Mar 23 2015 Fabian Affolter <mail at fabian-affolter.ch> - 0.9.9-1
+ - Update to new upstream version 0.9.9
+ 
+ * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Fri Jun 27 2014 Fabian Affolter <mail at fabian-affolter.ch> - 0.9.7-1
+ - Update to new upstream version 0.9.7
+ 
  * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild