[python-dulwich/f14/master: 6/6] Merge branch 'master' into f14

[Fabian Affolter]

commit b5f392a9e4d8de4f3f6947311b08a9c17eef2ceb
Merge: b1ac17f b3daa3a
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Sun Apr 17 14:46:02 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	python-dulwich.spec
    	sources

 .gitignore          |    5 +++++
 python-dulwich.spec |   34 +++++++++++++++++++++++++++++-----
 sources             |    2 +-
 3 files changed, 35 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 0fbb69e,b2923b6..6500ca9
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,6 @@@
  /dulwich-0.6.2.tar.gz
++<<<<<<< HEAD
++=======
+ /dulwich-0.7.0.tar.gz
++>>>>>>> master
++/dulwich-0.7.1.tar.gz
diff --cc python-dulwich.spec
index 2a09495,0f17b7d..d21477a
--- a/python-dulwich.spec
+++ b/python-dulwich.spec
@@@ -8,8 -8,8 +8,8 @@@
  %filter_setup
  
  Name:           python-%{srcname}
- Version:        0.6.2
 -Version:        0.7.0
 -Release:        3%{?dist}
++Version:        0.7.1
 +Release:        1%{?dist}
  Summary:        A python implementation of the Git file formats and protocols
  
  Group:          Development/Libraries
@@@ -31,11 -31,9 +31,8 @@@ Mrs. Git live in the Monty Python sketc
  
  %prep
  %setup -q -n %{srcname}-%{version}
- sed -i -e '/^#!\//, 1d' docs/tutorial/test.py
- rm docs/tutorial/.gitignore
- chmod -x docs/tutorial/test.py
  
  
 -
  %build
  CFLAGS="%{optflags}" %{__python} setup.py build
  
@@@ -51,7 -49,21 +48,22 @@@ rm -rf %{buildroot
  
  %check
  cd dulwich/tests
- nosetests test*.py
++#nosetests test*.py
+ nosetests test_blackbox.py
+ nosetests test_client.py
+ #nosetests test_diff_tree.py
+ nosetests test_fastexport.py
+ nosetests test_file.py
+ nosetests test_index.py
+ nosetests test_lru_cache.py
+ nosetests test_objects.py
+ nosetests test_object_store.py
+ nosetests test_patch.py
+ nosetests test_pack.py
+ nosetests test_protocol.py
+ nosetests test_repository.py
+ nosetests test_server.py
+ nosetests test_web.py
  
  
  %files
@@@ -64,6 -76,15 +76,18 @@@
  
  
  %changelog
++* Sun Apr 17 2011 Fabian Affolter <fabian at bernewireless.net> - 0.7.1-1
++- Updated to new upstream version 0.7.1
++
+ * Fri Mar 11 2011 Fabian Affolter <fabian at bernewireless.net> - 0.7.0-3
+ - Test section reworked
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Thu Jan 27 2011 Fabian Affolter <fabian at bernewireless.net> - 0.7.0-1
+ - Updated to new upstream version 0.7.0
+ 
  * Sat Nov 08 2010 Fabian Affolter <fabian at bernewireless.net> - 0.6.2-1
  - Filtering added
  - Updated to new upstream version 0.6.2
diff --cc sources
index 96ae7c8,3d07a6b..ec4af33
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,1 @@@
- 69d7e998f466972d5f9e0a6c6c1147f1  dulwich-0.6.2.tar.gz
 -bd087ee7ff8f4bd274192a2c945201f9  dulwich-0.7.0.tar.gz
++ee1713c574146735490c229cdef5375e  dulwich-0.7.1.tar.gz