SPECS: koji.spec - use webapps

[patrys]

Author: patrys                       Date: Fri Jan  4 15:05:27 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use webapps

---- Files affected:
SPECS:
   koji.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/koji.spec
diff -u SPECS/koji.spec:1.1 SPECS/koji.spec:1.2
--- SPECS/koji.spec:1.1	Fri Jan  4 15:56:06 2008
+++ SPECS/koji.spec	Fri Jan  4 16:05:21 2008
@@ -25,7 +25,7 @@
 Group:		Applications/Networking
 Requires:	%{name} = %{version}-%{release}
 Requires:	apache-mod_python
-Requires:	httpd
+Requires:	webapps
 Requires:	python-postgresql
 
 %description hub
@@ -66,7 +66,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	apache-mod_auth_kerb
 Requires:	apache-mod_python
-Requires:	httpd
+Requires:	webapps
 Requires:	python-cheetah
 Requires:	python-krbV >= 1.0.13
 Requires:	python-postgresql
@@ -81,7 +81,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+mv $RPM_BUILD_ROOT%{_sysconfdir}/httpd/{conf.d,webapps.d}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,7 +99,7 @@
 %files hub
 %defattr(644,root,root,755)
 %{_datadir}/koji-hub
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/kojihub.conf
+%config(noreplace) %{_sysconfdir}/httpd/webapps.d/kojihub.conf
 
 %files utils
 %defattr(644,root,root,755)
@@ -110,7 +113,7 @@
 %defattr(644,root,root,755)
 %{_datadir}/koji-web
 %{_sysconfdir}/kojiweb
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/kojiweb.conf
+%config(noreplace) %{_sysconfdir}/httpd/webapps.d/kojiweb.conf
 
 %files builder
 %defattr(644,root,root,755)
@@ -122,7 +125,7 @@
 %attr(-,kojibuilder,kojibuilder) %{_sysconfdir}/mock/koji
 
 %pre builder
-%useradd -r -s /bin/bash -G mock -d /builddir -M kojibuilder 2>/dev/null ||:
+%useradd -u 55 -r -d /home/services/koji -s /bin/false -c "Koji builder" -g nobody kojibuilder
 
 %post builder
 /sbin/chkconfig --add kojid
@@ -149,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2008-01-04 15:05:21  patrys
+- use webapps
+
 Revision 1.1  2008-01-04 14:56:06  patrys
 - initial, taken from Fedora
 - NFY
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/koji.spec?r1=1.1&r2=1.2&f=u