rpms/beanstalkd/EL-5 .cvsignore, 1.4, 1.5 beanstalkd.init, 1.2, 1.3 beanstalkd.spec, 1.4, 1.5 beanstalkd.sysconfig, 1.2, 1.3 sources, 1.5, 1.6

Sat Jun 5 22:29:30 UTC 2010

Author: jjh

Update of /cvs/pkgs/rpms/beanstalkd/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11485

Modified Files:
	.cvsignore beanstalkd.init beanstalkd.spec 
	beanstalkd.sysconfig sources 
Log Message:
update to 1.4.6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- .cvsignore	18 Oct 2009 02:48:24 -0000	1.4
+++ .cvsignore	5 Jun 2010 22:29:30 -0000	1.5
@@ -1,3 +1 @@
-beanstalkd-1.3.tar.gz
-beanstalkd-1.4.tar.gz
-beanstalkd-1.4.2.tar.gz
+beanstalkd-1.4.6.tar.gz


Index: beanstalkd.init
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/beanstalkd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- beanstalkd.init	18 Oct 2009 02:48:24 -0000	1.2
+++ beanstalkd.init	5 Jun 2010 22:29:30 -0000	1.3
@@ -12,8 +12,9 @@
 # Provides: beanstalkd
 # Required-Start: $local_fs $network $remote_fs
 # Required-Stop: $local_fs $network $remote_fs
+# Default-Stop: 0 1 2 6
 # Short-Description: start and stop beanstalkd
-# Description: a simple, fast workqueue service
+# Description: a simple, fast work-queue service
 ### END INIT INFO
 
 # Source function library.


Index: beanstalkd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/beanstalkd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- beanstalkd.spec	18 Oct 2009 02:48:24 -0000	1.4
+++ beanstalkd.spec	5 Jun 2010 22:29:30 -0000	1.5
@@ -2,11 +2,12 @@
 %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.2
+Version:        1.4.6
 Release:        1%{?dist}
-Summary:        A simple, fast workqueue service
+Summary:        A simple, fast work-queue service
 
 Group:          System Environment/Daemons
 License:        GPLv3+
@@ -19,6 +20,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
@@ -26,7 +28,7 @@ Requires(postun):   initscripts
 
 
 %description
-beanstalkd is a simple, fast workqueue service. Its interface is generic,
+beanstalkd is a simple, fast work-queue service. Its interface is generic,
 but was originally designed for reducing the latency of page views in
 high-volume web applications by running most time-consuming tasks
 asynchronously.
@@ -50,17 +52,31 @@ 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} %{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 +95,16 @@ 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
+* Sat Jun 05 2010 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.6-1
+- update to upstream 1.4.6
+- fix binlogdir location initialization for bug #55831
+- change default binlogdir in sysconfig file
+
 * Sat Oct 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 1.4.2-1
 - update to upstream 1.4.2
 


Index: beanstalkd.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/beanstalkd.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- beanstalkd.sysconfig	18 Oct 2009 02:48:24 -0000	1.2
+++ beanstalkd.sysconfig	5 Jun 2010 22:29:30 -0000	1.3
@@ -13,8 +13,7 @@ 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
+# The direcory to house the binlog.
 #BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
 #
 # fsync the binlog at most once every N milliseconds.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beanstalkd/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Oct 2009 02:48:24 -0000	1.5
+++ sources	5 Jun 2010 22:29:30 -0000	1.6
@@ -1,3 +1 @@
-de94ab64cd02af4ed1f37cacdaf49be5  beanstalkd-1.3.tar.gz
-eea47c86c722c4448087fb28be7357cd  beanstalkd-1.4.tar.gz
-848ecf1a040e018cb0ee10a203b62896  beanstalkd-1.4.2.tar.gz
+3dbbb64a6528efaaaa841ea83b30768e  beanstalkd-1.4.6.tar.gz

