[bcfg2/el6] Minor changes

[Fabian Affolter]

commit ce1d3cc36dca8136b5a9f38cb81e33eaa6f547c4
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Jul 7 19:02:22 2012 +0200

    Minor changes

 bcfg2.spec |   56 ++++++++++++++------------------------------------------
 1 files changed, 14 insertions(+), 42 deletions(-)
---
diff --git a/bcfg2.spec b/bcfg2.spec
index 6591086..710db8e 100644
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@ -1,3 +1,6 @@
+%if (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%endif
 %{!?py_ver: %define py_ver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
 %global pythonversion %{py_ver}
 #%global _rc 1
@@ -28,7 +31,7 @@ BuildRequires:    python-setuptools
 Requires:         python-lxml
 Requires:         python-nose
 %if 0%{?epel} > 0
-Requires:	      python-ssl
+Requires:         python-ssl
 %endif
 
 %if 0%{?fedora} >= 16
@@ -61,7 +64,7 @@ systems. Bcfg2 is therefore built to help administrators construct an
 accurate, comprehensive specification.
 
 %package server
-Summary:          A configuration management server
+Summary:          Configuration management server
 Group:            System Environment/Daemons
 Requires:         bcfg2 = %{version}-%{release}
 Requires:         /usr/sbin/sendmail
@@ -82,30 +85,10 @@ Requires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig
 Requires(preun):  /sbin/service
 Requires(postun): /sbin/service
-%if 0%{?epel} > 0
-Requires:	  python-ssl
 %endif
 
 %description server
-A configuration management server
-
-%package web
-Summary:          Bcfg2 Web Reporting Interface
-Group:            System
-
-Requires:         bcfg2-server
-Requires:         httpd
-Requires:         Django
-%if "%{_vendor}" == "redhat"
-Requires: mod_wsgi
-%define apache_conf %{_sysconfdir}/httpd
-%else
-Requires: apache2-mod_wsgi
-%define apache_conf %{_sysconfdir}/apache2
-%endif
-
-%description web
-The Bcfg2 Web Reporting Interface.
+Configuration management server
 
 %package web
 Summary:          Bcfg2 Web Reporting Interface
@@ -143,7 +126,6 @@ Group:            System
 Examples files for Bcfg2.
 
 %prep
-%setup0 -q -n %{name}-%{version}
 %setup -q
 #%setup -q -n %{name}-%{version}%{?_rc:rc%{_rc}}
 #%setup -q -n %{name}-%{version}%{?_pre:pre%{_pre}}
@@ -166,13 +148,11 @@ do
     %{__sed} -i -e '/^#!/,1d' $f
 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}"}
 #%{__python}%{pythonversion} setup.py build_dtddoc
 #%{__python}%{pythonversion} setup.py build_sphinx
@@ -189,7 +169,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 mkdir -p %{buildroot}%{_libexecdir}
 mkdir -p %{buildroot}%{_var}/lib/bcfg2
 mkdir -p %{buildroot}%{_var}/cache/bcfg2
-mkdir -p %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}
 
 mv %{buildroot}%{_bindir}/bcfg2* %{buildroot}%{_sbindir}
 
@@ -315,7 +294,7 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYRIGHT README
 %{_mandir}/man1/bcfg2.1*
-%{_mandir}/man5/bcfg2.conf.5*
+%{_mandir}/man5/bcfg2*.5*
 %ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.cert
 %ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.conf
 %if 0%{?fedora} >= 16
@@ -325,6 +304,9 @@ fi
 %{_sysconfdir}/cron.daily/bcfg2
 %{_sysconfdir}/cron.hourly/bcfg2
 %{_initrddir}/bcfg2
+%{_sbindir}/bcfg2
+%{_libexecdir}/bcfg2-cron
+%dir %{_var}/cache/bcfg2
 %{python_sitelib}/Bcfg2*.egg-info
 %dir %{python_sitelib}/Bcfg2
 %{python_sitelib}/Bcfg2/__init__.*
@@ -336,30 +318,20 @@ fi
 %{python_sitelib}/Bcfg2/SSLServer.*
 %{python_sitelib}/Bcfg2/Statistics.*
 %{python_sitelib}/Bcfg2/Bcfg2Py3k.*
-%{_sbindir}/bcfg2
-%{_libexecdir}/bcfg2-cron
-%dir %{_var}/cache/bcfg2
 
 %files server
 %defattr(-,root,root,-)
-%{_mandir}/man8/%{name}*.8*
-%{_mandir}/man5/%{name}*.5*
+%{_mandir}/man8/bcfg2*.8*
 %ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.key
 %if 0%{?fedora} >= 16
     %config(noreplace) %{_unitdir}/%{name}-server.service
 %endif
 %config(noreplace) %{_sysconfdir}/sysconfig/bcfg2-server
 %{_initrddir}/bcfg2-server
-%{python_sitelib}/Bcfg2/Server
 %{_datadir}/bcfg2
 %{_sbindir}/bcfg2-*
 %dir %{_var}/lib/bcfg2
-
-%files web
-%defattr(-,root,root,-)
-%{_datadir}/bcfg2/reports.wsgi
-%{_datadir}/bcfg2/site_media
-%config(noreplace) %{apache_conf}/conf.d/wsgi_bcfg2.conf
+%{python_sitelib}/Bcfg2/Server
 
 %files web
 %defattr(-,root,root,-)