rpms/qpid-cpp/devel qpidd.patch,NONE,1.1 qpid-cpp.spec,1.2,1.3

[Nuno Santos]

Author: nsantos

Update of /cvs/pkgs/rpms/qpid-cpp/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29276

Modified Files:
	qpid-cpp.spec 
Added Files:
	qpidd.patch 
Log Message:
BZ574880 - Add restorecon to qpid init script

qpidd.patch:
 qpidd |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE qpidd.patch ---
--- cpp/etc/qpidd	2010-03-18 14:40:29.000000000 -0400
+++ cpp/etc/qpidd	2010-03-18 14:41:12.000000000 -0400
@@ -57,6 +57,7 @@
 	if [ $RETVAL = 0 ]; then
 	    touch $pidfile
 	    chown qpidd.qpidd $pidfile
+            [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile
 	    runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd > $pidfile"
 	fi
 	return $RETVAL


Index: qpid-cpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qpid-cpp/devel/qpid-cpp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qpid-cpp.spec	6 Mar 2010 00:32:47 -0000	1.2
+++ qpid-cpp.spec	19 Mar 2010 21:18:38 -0000	1.3
@@ -26,7 +26,7 @@
 %global qpid_svnrev         895736
 %global store_svnrev        3795
 # Change this release number for each build of the same qpid_svnrev, otherwise set back to 1.
-%global release_num         1
+%global release_num         2
 
 # NOTE: no more than one of these flags should be set at the same time!
 # RHEL-6 builds (the default) should have all these flags set to 0.
@@ -83,6 +83,7 @@ Patch0:         so_number.patch
 Patch1:		xqilla.patch
 Patch2:		boost_system.patch
 Patch3:		db4.patch
+Patch4:		qpidd.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{rhel_5}
@@ -689,6 +690,7 @@ exit 1
 %patch0
 %patch1
 %patch2
+%patch4
 pushd ../store-%{qpid_release}.%{store_svnrev}
 %patch3
 popd
@@ -847,6 +849,9 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 
 %changelog
+* Fri Mar 19 2010 Nuno Santos <nsantos at redhat.com> - 0.6.895736-2
+- BZ574880 - Add restorecon to qpid init script
+
 * Tue Mar 2 2010 Kim van der Riet<kim.vdriet at redhat.com> - 0.6.895736-1
 - Imported unified specfile from RHEL maintained by Kim van der Riet