[iodine] - Add -DLINUX to build options (BZ#644310, thanks to Andy Shevchenko) - Fix service scripts to find

[Pavel Alexeev]

commit c5e312361229a595d920a8af43df1471fb41e0ae
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Sat Oct 23 23:57:12 2010 +0400

    - Add -DLINUX to build options (BZ#644310, thanks to Andy Shevchenko)
    - Fix service scripts to find binaries in /usr/sbin instead of /usr/bin (BZ#644299 thanks to Andy Shevchenko)

 iodine-client.init |    2 +-
 iodine-server.init |    2 +-
 iodine.spec        |    8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/iodine-client.init b/iodine-client.init
index 2df0ea7..d6b04bf 100644
--- a/iodine-client.init
+++ b/iodine-client.init
@@ -21,7 +21,7 @@
 . /etc/rc.d/init.d/functions
 
 exec_short="iodine"
-exec="/usr/bin/${exec_short}"
+exec="/usr/sbin/${exec_short}"
 prog="iodine-client"
 logfile="/var/log/${prog}.log"
 
diff --git a/iodine-server.init b/iodine-server.init
index 2f55c16..e246f1b 100644
--- a/iodine-server.init
+++ b/iodine-server.init
@@ -21,7 +21,7 @@
 . /etc/rc.d/init.d/functions
 
 exec_short="iodined"
-exec="/usr/bin/${exec_short}"
+exec="/usr/sbin/${exec_short}"
 prog="iodine-server"
 logfile="/var/log/${prog}.log"
 
diff --git a/iodine.spec b/iodine.spec
index b42115f..f255328 100644
--- a/iodine.spec
+++ b/iodine.spec
@@ -2,7 +2,7 @@
 
 Name:		iodine
 Version:		0.6.0
-Release:		0.rc1.4%{?dist}.2
+Release:		0.rc1.5%{?dist}
 Summary:		Solution to tunnel IPv4 data through a DNS server
 Summary(ru):	Решение для туннелирования IPv4 трафика через DNS сервер
 Group:		System Environment/Daemons
@@ -52,7 +52,7 @@ Iodine работает на Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD и Window
 
 %build
 # It is fail to build without -c gcc flag (comes from upstream Makefile).
-make %{?_smp_mflags} PREFIX=%{_prefix} CFLAGS="-c %{optflags}"
+make %{?_smp_mflags} PREFIX=%{_prefix} CFLAGS="-c %{optflags} -DLINUX"
 
 %install
 rm -rf %{buildroot}
@@ -105,6 +105,10 @@ fi
 
 
 %changelog
+* Sat Oct 23 2010 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6.0-0.rc1.5
+- Add -DLINUX to build options (BZ#644310, thanks to Andy Shevchenko)
+- Fix service scripts to find binaries in /usr/sbin instead of /usr/bin (BZ#644299 thanks to Andy Shevchenko)
+
 * Wed Sep 29 2010 jkeating - 0.6.0-0.rc1.4.2
 - Rebuilt for gcc bug 634757