[bcfg2/el6] Minor fixes

[Fabian Affolter]

commit 423d11e99ad5f42b9b9f3ddc0468a9186268f105
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Jul 7 18:46:16 2012 +0200

    Minor fixes

 bcfg2.spec |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/bcfg2.spec b/bcfg2.spec
index 6af6508..6591086 100644
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@ -170,7 +170,7 @@ done
 %build
 %{__python} -c 'import setuptools; execfile("setup.py")' build
 %{__python} -c 'import setuptools; execfile("setup.py")' build_sphinx
-%{__python} setup.py build
+#%{__python} setup.py build
 #%{__python} setup.py build_dtddoc
 %{__python} setup.py build_sphinx
 #%{?pythonpath: export PYTHONPATH="%{pythonpath}"}
@@ -421,7 +421,6 @@ fi
 * Sun Mar 20 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.0-1.1.pre1
 - Added doc subpackage
 - Updated to new upstream version 1.2.0pre1
->>>>>>> master
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild