rpms/memcached/FC-6 memcached-1.2.3-save_pid_fix.patch, 1.1, 1.2 memcached.spec, 1.2, 1.3

[Paul Lindner (plindner)]

Author: plindner

Update of /cvs/pkgs/rpms/memcached/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29701

Modified Files:
	memcached-1.2.3-save_pid_fix.patch memcached.spec 
Log Message:
Fix for startup on fc6, startup crash on x86_64

memcached-1.2.3-save_pid_fix.patch:

Index: memcached-1.2.3-save_pid_fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/FC-6/memcached-1.2.3-save_pid_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memcached-1.2.3-save_pid_fix.patch	6 Aug 2007 14:19:18 -0000	1.1
+++ memcached-1.2.3-save_pid_fix.patch	9 Aug 2007 22:21:46 -0000	1.2
@@ -9,7 +9,7 @@
 -        save_pid(getpid(), pid_file);
      /* start up worker threads if MT mode */
      thread_init(settings.num_threads, main_base);
-+    /* save the PID in if we're a daemon, do this after thread_init due to 
++    /* save the PID in if we're a daemon, do this after thread_init due to
 +       a file descriptor handling bug somewhere in libevent */
 +    if (daemonize)
 +        save_pid(getpid(), pid_file);


Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/FC-6/memcached.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- memcached.spec	6 Aug 2007 14:19:18 -0000	1.2
+++ memcached.spec	9 Aug 2007 22:21:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           memcached
 Version:        1.2.3
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
 
 Group:          System Environment/Daemons
@@ -11,6 +11,9 @@
 # custom init script
 Source1:        memcached.sysv
 
+# Fixes
+Patch1:		memcached-1.2.3-save_pid_fix.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libevent-devel
@@ -27,6 +30,8 @@
 
 %prep
 %setup -q
+%patch1 -p1
+
 
 
 %build
@@ -100,7 +105,7 @@
 
 
 %changelog
-* Mon Aug  6 2007 Paul Lindner <lindner at inuus.com> - 1.2.3-5
+* Mon Aug  6 2007 Paul Lindner <lindner at inuus.com> - 1.2.3-7
 - Fix problem with -P and -d flag combo on x86_64
 - Fix init script for FC-6