SPECS: pld-builder.spec - few perms, pld-builder group

[glen]

Author: glen                         Date: Sun Jul 13 18:46:12 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- few perms, pld-builder group

---- Files affected:
SPECS:
   pld-builder.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/pld-builder.spec
diff -u SPECS/pld-builder.spec:1.31 SPECS/pld-builder.spec:1.32
--- SPECS/pld-builder.spec:1.31	Wed Jun 25 22:58:32 2008
+++ SPECS/pld-builder.spec	Sun Jul 13 20:46:07 2008
@@ -4,19 +4,22 @@
 Summary(pl.UTF-8):	Środowisko budowniczego pakietów RPM dla PLD
 Name:		pld-builder
 Version:	0.0.%{snap}
-Release:	0.20
+Release:	0.27
 License:	GPL
 Group:		Development/Building
 Source0:	%{name}.new-%{snap}.tar.bz2
 # Source0-md5:	1346166c8e0a7dacd5152e49f8648409
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
+Patch0:		%{name}.patch
 URL:		http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-builder.new/
 BuildRequires:	python
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/useradd
 Requires:	libuuid
@@ -73,6 +76,7 @@
 
 %prep
 %setup -q -n %{name}.new
+%patch0 -p1
 
 mv jak-wysy?a?-zlecenia.txt jak-wysylac-zlecenia.txt
 
@@ -82,6 +86,8 @@
 
 ' PLD_Builder/path.py
 
+%{__sed} -i -e 's,pld-linux\.org,example.org,g' config/builder.conf
+
 %build
 %{__make}
 
@@ -109,7 +115,7 @@
 cp -a admin/*.sh $RPM_BUILD_ROOT%{_datadir}/admin
 
 # dirs
-install -d $RPM_BUILD_ROOT{%{_sharedstatedir}/%{name}/{spool/{builds,ftp},lock,www/{s,}rpms},/etc/{sysconfig,rc.d/init.d}}
+install -d $RPM_BUILD_ROOT{%{_sharedstatedir}/%{name}/{spool/{buildlogs,builds,ftp,notify},lock,www/{s,}rpms},/etc/{sysconfig,rc.d/init.d}}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pld-builder
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pld-builder
@@ -118,8 +124,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%useradd -u 181 -g daemon -c "srpms builder" srpms_builder
-%useradd -u 182 -g daemon -c "bin builder" bin_builder
+%groupadd -g 181 pld-builder
+%useradd -u 181 -g pld-builder -c "srpms builder" srpms_builder
+%useradd -u 182 -g pld-builder -c "bin builder" bin_builder
 %useradd -u 183 -g daemon -c "ftpac" ftpac
 
 %post
@@ -137,6 +144,7 @@
 	%userremove srpms_builder
 	%userremove bin_builder
 	%userremove ftpac
+	%groupremove pld-builder
 fi
 
 %files
@@ -155,10 +163,12 @@
 %attr(755,root,root) %{_datadir}/admin/*
 
 %dir %{_sharedstatedir}/%{name}
-%dir %{_sharedstatedir}/%{name}/spool
+%dir %attr(775,root,pld-builder) %{_sharedstatedir}/%{name}/spool
+%dir %attr(775,root,pld-builder) %{_sharedstatedir}/%{name}/spool/buildlogs
 %dir %{_sharedstatedir}/%{name}/spool/builds
 %dir %{_sharedstatedir}/%{name}/spool/ftp
-%dir %{_sharedstatedir}/%{name}/lock
+%dir %attr(775,root,pld-builder) %{_sharedstatedir}/%{name}/spool/notify
+%dir %attr(775,root,pld-builder) %{_sharedstatedir}/%{name}/lock
 %dir %{_sharedstatedir}/%{name}/www
 %dir %{_sharedstatedir}/%{name}/www/rpms
 %dir %{_sharedstatedir}/%{name}/www/srpms
@@ -180,6 +190,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2008/07/13 18:46:07  glen
+- few perms, pld-builder group
+
 Revision 1.31  2008/06/25 20:58:32  glen
 - use us-ascii for filenames
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pld-builder.spec?r1=1.31&r2=1.32&f=u