rpms/beanstalkd/devel beanstalkd.spec, 1.8, 1.9 beanstalkd.sysconfig, 1.3, 1.4

[jjh]

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5194

Modified Files:
	beanstalkd.spec beanstalkd.sysconfig 
Log Message:
fixing bug 558310


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/devel/beanstalkd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- beanstalkd.spec	22 Feb 2010 07:18:38 -0000	1.8
+++ beanstalkd.spec	22 Feb 2010 18:22:14 -0000	1.9
@@ -1,11 +1,11 @@
 %define beanstalkd_user      beanstalkd
 %define beanstalkd_group     %{beanstalkd_user}
 %define beanstalkd_home      %{_localstatedir}/lib/beanstalkd
-%define beanstalkd_logdir    %{_localstatedir}/log/beanstalkd
+%define beanstalkd_binlogdir %{beanstalkd_home}/binlog
 
 Name:           beanstalkd
 Version:        1.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple, fast work-queue service
 
 Group:          System Environment/Daemons
@@ -19,6 +19,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:   libevent-devel
 
 Requires(pre):      %{_sbindir}/useradd
+Requires(pre):      %{_sbindir}/groupadd
 Requires(post):     chkconfig
 Requires(preun):    chkconfig
 Requires(preun):    initscripts
@@ -50,17 +51,30 @@ make install-man1 DESTDIR=$RPM_BUILD_ROO
 make install-exec-am DESTDIR=$RPM_BUILD_ROOT
 %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -d -m 0755 %{buildroot}%{beanstalkd_home}
+%{__install} -d -m 0755 %{buildroot}%{beanstalkd_binlogdir}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%{_sbindir}/useradd -c "beanstalkd user" -s /bin/false -r -m -d %{beanstalkd_home} %{beanstalkd_user} 2>/dev/null || :
+%{_sbindir}/groupadd -f -r %{beanstalkd_group} 
+%{_sbindir}/useradd -r -m -c "beanstalkd user" -s /bin/false  \
+    -d %{beanstalkd_home} -g %{beanstalkd_group} %{beanstalkd_user} 2>/dev/null || :
 
 %post
 /sbin/chkconfig --add %{name}
 
+# make the binlog dir after installation, this is so SELinux does not complain
+# about the init script creating the binlog directory
+# Bug 558310
+if [ -d %{beanstalkd_home} ]; then
+    %{__install} -d %{beanstalkd_binlogdir} -m 0755 \
+        -o %{beanstalkd_user} -g %{beanstalkd_user} \
+        %{beanstalkd_binlogdir}
+fi
+
 %preun
 if [ $1 = 0 ]; then
     /sbin/service %{name} stop >/dev/null 2>&1
@@ -79,9 +93,14 @@ fi
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1.gz
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%ghost %attr(0755,%{beanstalkd_user},%{beanstalkd_group}) %dir %{beanstalkd_home}
+%ghost %attr(0755,%{beanstalkd_user},%{beanstalkd_group}) %dir %{beanstalkd_binlogdir}
 
 
 %changelog
+* Mon Feb 22 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.3-2
+- fix binlogdir location initialization for bug #55831
+
 * Sun Feb 21 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.3-1
 - update to upstream 1.4.3
 - change default binlogdir in sysconfig file


Index: beanstalkd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/devel/beanstalkd.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- beanstalkd.sysconfig	22 Feb 2010 07:18:39 -0000	1.3
+++ beanstalkd.sysconfig	22 Feb 2010 18:22:14 -0000	1.4
@@ -13,9 +13,8 @@ BEANSTALKD_USER=beanstalkd
 
 # Using the binlog is off by default.
 #
-# The direcory to house the binlog.  This will be created
-# if it does not exist
-#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd
+# The direcory to house the binlog.
+#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
 #
 # fsync the binlog at most once every N milliseconds.
 # setting this to 0 means 'always fsync'. If this is unset,