SPECS: cobbler.spec - requires Cheetah 2.0 - use included apache c...

[glen]

Author: glen                         Date: Sun Dec  9 12:10:06 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- requires Cheetah 2.0
- use included apache config

---- Files affected:
SPECS:
   cobbler.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/cobbler.spec
diff -u SPECS/cobbler.spec:1.3 SPECS/cobbler.spec:1.4
--- SPECS/cobbler.spec:1.3	Sun Dec  9 12:42:08 2007
+++ SPECS/cobbler.spec	Sun Dec  9 13:10:01 2007
@@ -5,16 +5,17 @@
 Summary:	Boot server configurator
 Name:		cobbler
 Version:	0.6.4
-Release:	0.5
+Release:	0.6
 Source0:	http://cobbler.et.redhat.com/download/%{name}-%{version}.tar.gz
 # Source0-md5:	1f46e1860e10b2e250c73ebb2a3d8227
 Source1:	%{name}-apache.conf
 License:	GPL v2+
 Group:		Applications/System
+Requires:	apache-mod_proxy
 Requires:	apache-mod_python
 Requires:	createrepo
 Requires:	python >= 2.3
-Requires:	python-cheetah
+Requires:	python-cheetah >= 2.0
 Requires:	python-devel
 Requires:	python-rhpl
 Requires:	tftpdaemon
@@ -64,12 +65,14 @@
 	--root=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+#cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
+#cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+mv $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/conf.d/cobbler.conf,%{_webapps}/%{_webapp}/apache.conf}
+cp $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/{apache,httpd}.conf
 
 %py_postclean
 
-mv $RPM_BUILD_ROOT/etc/{init.d,rc.d/init.d}/cobblerd
+mv $RPM_BUILD_ROOT/''etc/{init.d,rc.d/init.d}/cobblerd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -178,7 +181,6 @@
 %{py_sitescriptdir}/cobbler/webui/*.py[co]
 %{_mandir}/man1/cobbler.1*
 %attr(754,root,root) /etc/rc.d/init.d/cobblerd
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
 
 %defattr(755,root,root)
@@ -225,6 +227,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2007-12-09 12:10:01  glen
+- requires Cheetah 2.0
+- use included apache config
+
 Revision 1.3  2007-12-09 11:42:08  glen
 - add apache configs, missing dir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cobbler.spec?r1=1.3&r2=1.4&f=u