[bcfg2: 7/16] reconcile: %prep and %build sections

[John Morris]

commit 4230d377cebe1a8317be0127b40b8578902d4302
Author: John Morris <john at zultron.com>
Date:   Sun Aug 4 17:03:01 2013 -0500

    reconcile: %prep and %build sections
    
    - init scripts now from redhat/scripts directory; no need to munge deb versions
    - fix apache config
    - remove commented-out dtddoc build

 bcfg2.spec |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/bcfg2.spec b/bcfg2.spec
index 7a0dd7d..b3ea0e0 100644
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@ -331,33 +331,25 @@ This package includes the examples files for Bcfg2.
 %patch0 -p1 -b .disable_tests
 
 # Fixup some paths
-%{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig at g' debian/bcfg2.init
-%{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig at g' debian/bcfg2-server.init
 %{__perl} -pi -e 's@/etc/default@%{_sysconfdir}/sysconfig at g' tools/bcfg2-cron
 
 %{__perl} -pi -e 's@/usr/lib/bcfg2@%{_libexecdir}@g' debian/bcfg2.cron.daily
 %{__perl} -pi -e 's@/usr/lib/bcfg2@%{_libexecdir}@g' debian/bcfg2.cron.hourly
 
-# Don't start servers by default
-%{__perl} -pi -e 's at chkconfig: (\d+)@chkconfig: -@' debian/bcfg2.init
-%{__perl} -pi -e 's at chkconfig: (\d+)@chkconfig: -@' debian/bcfg2-server.init
-
 # Get rid of extraneous shebangs
 for f in `find src/lib -name \*.py`
 do
     %{__sed} -i -e '/^#!/,1d' $f
 done
 
+sed -i "s/apache2/httpd/g" misc/apache/bcfg2.conf
+
 
 %build
 %{__python} setup.py build
-#%{__python} setup.py build_dtddoc
 %{?pythonpath: PYTHONPATH="%{pythonpath}"} \
     %{__python} setup.py build_sphinx
 
-#%{?pythonpath: export PYTHONPATH="%{pythonpath}"}
-#%{__python}%{python_version} setup.py build_dtddoc
-
 
 %install
 %if 0%{?rhel} == 5