[ice] fix float literals generation (RHBZ #812156) fix systemd service (RHBZ #789712)

[Haïkel Guémar]

commit ee44a3f4f4328d469cf353f5729042c572f0418d
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Mon Apr 16 08:57:53 2012 +0200

    fix float literals generation (RHBZ #812156)
    fix systemd service (RHBZ #789712)

 glacier2router.service    |    5 ++---
 ice-3.4.2-slice2cpp.patch |   33 +++++++++++++++++++++++++++++++++
 ice.spec                  |    9 ++++++++-
 icegridnode.service       |    4 ++--
 icegridregistry.service   |    5 ++---
 5 files changed, 47 insertions(+), 9 deletions(-)
---
diff --git a/glacier2router.service b/glacier2router.service
index a0890b2..f04d4c6 100644
--- a/glacier2router.service
+++ b/glacier2router.service
@@ -4,12 +4,11 @@ After=syslog.target
 After=network.target
 
 [Service]
-Type=simple
+Type=forking
+PIDFile=/run/glacier2router.pid
 User=iceuser
 Group=iceuser
-
 ExecStart=/usr/bin/glacier2router --Ice.Config=/etc/glacier2router.conf
-Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ice-3.4.2-slice2cpp.patch b/ice-3.4.2-slice2cpp.patch
new file mode 100644
index 0000000..6499d6d
--- /dev/null
+++ b/ice-3.4.2-slice2cpp.patch
@@ -0,0 +1,33 @@
+From d6f9a9c6afa570c08465e8f00ffc1fc12b6b0017 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar at fedoraproject.org>
+Date: Mon, 16 Apr 2012 08:54:15 +0200
+Subject: [PATCH] slice2cpp float literals generation fix (RHBZ #812156)
+
+---
+ cpp/src/slice2cpp/Gen.cpp |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
+index dfceb00..d689f67 100644
+--- a/cpp/src/slice2cpp/Gen.cpp
++++ b/cpp/src/slice2cpp/Gen.cpp
+@@ -104,7 +104,15 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
+         }
+         else if(bp && bp->kind() == Builtin::KindFloat)
+         {
+-            out << value << "F";
++            out << value;
++            if(std::string::npos == value.find('.')))       // if there's no dot, we add it before the f literal
++            {
++                out << ".0f";
++            }
++            else
++            {
++                out << "f";
++            }
+         }
+         else
+         {
+-- 
+1.7.10
+
diff --git a/ice.spec b/ice.spec
index a2361c1..f644edb 100644
--- a/ice.spec
+++ b/ice.spec
@@ -7,7 +7,7 @@
 
 Name:           ice
 Version:        3.4.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        ZeroC Object-Oriented middleware
 
 Group:          System Environment/Libraries
@@ -50,6 +50,9 @@ Patch7:         ice-3.4.2-gcc47.patch
 # [-fpermissive]
 # See: http://www.zeroc.com/forums/patches/5647-patch-compiling-ice-clang-gcc4-7-a.html
 Patch8:         ice-3.4.2-declfix.patch
+# fixed slice2cpp float literals generation fixed upstream in next release RHBZ #812156
+# http://www.zeroc.com/forums/bug-reports/5431-default-vaules-slice.html
+Patch9:         ice-3.4.2-slice2cpp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support ppc64 at all
@@ -604,6 +607,10 @@ fi
 
 
 %changelog
+* Mon Apr 16 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 3.4.2-12
+- fix float literals generation (RHBZ #812156)
+- fix systemd services (RHBZ #789712)
+
 * Fri Mar 16 2012 Tom Callaway <spot at fedoraproject.org> 3.4.2-11
 - fix issue where upCast is used before being declared with gcc 4.7
 
diff --git a/icegridnode.service b/icegridnode.service
index 9f921be..ed73a51 100644
--- a/icegridnode.service
+++ b/icegridnode.service
@@ -4,12 +4,12 @@ After=syslog.target
 After=network.target
 
 [Service]
-Type=simple
+Type=forking
+PIDFile=/run/icegridnode.pid
 User=iceuser
 Group=iceuser
 
 ExecStart=/usr/bin/icegridnode --Ice.Config=/etc/icegridnode.conf
-Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/icegridregistry.service b/icegridregistry.service
index 7c11ce2..ddfedcb 100644
--- a/icegridregistry.service
+++ b/icegridregistry.service
@@ -4,12 +4,11 @@ After=syslog.target
 After=network.target
 
 [Service]
-Type=simple
+Type=forking
+PIDFile=/run/icegridregistry.pid
 User=iceuser
 Group=iceuser
-
 ExecStart=/usr/bin/icegridregistry --Ice.Config=/etc/icegridregistry.conf
-Restart=always
 
 [Install]
 WantedBy=multi-user.target