[python-bunch/el6/master: 9/9] Merge branch 'master' into el6

[Toshio くらとみ]

commit 838b9898a8a91a4d22b72dd7abeea1cf2b9c8fbe
Merge: 37ac8a2 9917fd7
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Sep 1 17:05:25 2010 -0400

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

 python-bunch.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc python-bunch.spec
index 577b50e,cd0cb9c..e119388
--- a/python-bunch.spec
+++ b/python-bunch.spec
@@@ -67,5 -67,8 +67,8 @@@ PYTHONPATH=build/lib python build/lib/b
  
  
  %changelog
+ * Fri Jul 30 2010 Toshio Kuraotmi <toshio at fedoraproject.org> - 1.0.0-2
 -- Rebuild for python-2.7
++- Fix build when fedora macro is not defined.
+ 
  * Fri Mar 19 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.0-1
  - Initial Fedora Build