rpms/ice/F-11 Ice-rpmbuild-change-user.patch, NONE, 1.1 ice.spec, 1.31, 1.32

[mef]

Author: mef

Update of /cvs/pkgs/rpms/ice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19144

Modified Files:
	ice.spec 
Added Files:
	Ice-rpmbuild-change-user.patch 
Log Message:
s/ice/iceuser/ in F-11 also

Ice-rpmbuild-change-user.patch:
 glacier2router.redhat  |    2 +-
 icegridnode.redhat     |    2 +-
 icegridregistry.redhat |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE Ice-rpmbuild-change-user.patch ---
diff -u Ice-rpmbuild-3.3.1.orig/glacier2router.redhat Ice-rpmbuild-3.3.1/glacier2router.redhat
--- Ice-rpmbuild-3.3.1.orig/glacier2router.redhat	2010-02-01 14:31:01.809694649 +0000
+++ Ice-rpmbuild-3.3.1/glacier2router.redhat	2010-02-01 14:31:49.156694764 +0000
@@ -19,7 +19,7 @@
 # The Glacier2 router user; root is allowed, but not necessary, therefore
 # it is recommended to use a non-root account.
 #
-user=ice
+user=iceuser
 
 #
 # Ask for a password at startup?
diff -u Ice-rpmbuild-3.3.1.orig/icegridnode.redhat Ice-rpmbuild-3.3.1/icegridnode.redhat
--- Ice-rpmbuild-3.3.1.orig/icegridnode.redhat	2010-02-01 14:31:01.809694649 +0000
+++ Ice-rpmbuild-3.3.1/icegridnode.redhat	2010-02-01 14:31:25.039757166 +0000
@@ -20,7 +20,7 @@
 # The IceGrid node user; root is allowed, but not necessary, therefore
 # it is recommended to use a non-root account.
 #
-user=ice
+user=iceuser
 
 #
 # Ask for a password at startup?
diff -u Ice-rpmbuild-3.3.1.orig/icegridregistry.redhat Ice-rpmbuild-3.3.1/icegridregistry.redhat
--- Ice-rpmbuild-3.3.1.orig/icegridregistry.redhat	2010-02-01 14:31:01.809694649 +0000
+++ Ice-rpmbuild-3.3.1/icegridregistry.redhat	2010-02-01 14:31:58.924756281 +0000
@@ -20,7 +20,7 @@
 # The IceGrid registry user; root is allowed, but not necessary, therefore
 # it is recommended to use a non-root account.
 #
-user=ice
+user=iceuser
 
 #
 # Ask for a password at startup?


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-11/ice.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ice.spec	8 Jul 2009 09:24:48 -0000	1.31
+++ ice.spec	1 Feb 2010 14:52:26 -0000	1.32
@@ -4,7 +4,7 @@
 
 Name: ice
 Version: 3.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -30,6 +30,9 @@ Patch3:         ice-3.3.1-patch1.txt
 Patch4:         slice.patch.txt
 # http://www.zeroc.com/forums/patches/4423-patch-3-ice-3-3-1-net-only-fix-random-endpoint-selection.html
 Patch5:         patch-rand.txt
+# Change user in server scripts from "ice" to "iceuser" to match the config
+# Fixed bug 557411
+Patch6:		Ice-rpmbuild-change-user.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -174,6 +177,7 @@ The Ice runtime for PHP applications.
 %patch4 -p1
 %patch5 -p1
 %setup -q -n Ice-rpmbuild-%{version} -T -b 1
+%patch6 -p1
 %setup -q -n Ice-3.3.0-man-pages -T -b 2
 
 %build
@@ -534,6 +538,9 @@ fi
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Mon Feb  1 2010 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1-3
+- Fix the user name in the server scripts (bug 557411)
+
 * Wed Jul  8 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1-2
 - Include upstream patches:
   - slice2html creates bad links