Adjusting libexec structure

diff --git a/linux/osukiss/receiver b/linux/osukiss/receiver
index fcd4b28dfa7ff03d3a64e210b84fd8c7d0037338..b908605a554479cca936031643203e9830235520 100644 (file)
--- a/linux/osukiss/receiver
+++ b/linux/osukiss/receiver
@@ -48,13 +48,13 @@ case "$1" in
       exit 1;
       fi
     log_info_msg "Starting ${DAEMON} Server..."
-    start_daemon -f /usr/libexec/$APPNAME/${DAEMON} $OPTIONS
+    start_daemon -f /usr/libexec/$APPNAME/bin/${DAEMON} $OPTIONS
     evaluate_retval
     ;;
 
   stop)
     log_info_msg "Stopping ${DAEMON} Server..."
-    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/${DAEMON}
+    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/bin/${DAEMON}
     evaluate_retval
     rm -fr ${DAEMON_PID}
     ;;

diff --git a/linux/osukiss/scanner b/linux/osukiss/scanner
index c9bb3d8858d935d1a0a4c0c0eb8c866aa946cead..d24d907526e7ef7010b4c16708da369ff9d02fe5 100644 (file)
--- a/linux/osukiss/scanner
+++ b/linux/osukiss/scanner
@@ -48,13 +48,13 @@ case "$1" in
       exit 1;
       fi
     log_info_msg "Starting ${DAEMON} Server..."
-    start_daemon -f /usr/libexec/$APPNAME/${DAEMON} $OPTIONS
+    start_daemon -f /usr/libexec/$APPNAME/bin/${DAEMON} $OPTIONS
     evaluate_retval
     ;;
 
   stop)
     log_info_msg "Stopping ${DAEMON} Server..."
-    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/${DAEMON}
+    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/bin/${DAEMON}
     evaluate_retval
     rm -fr ${DAEMON_PID}
     ;;

diff --git a/linux/osukiss/sender b/linux/osukiss/sender
index 8bab7968ed4b72662219959d4286a377f82d70c7..28b6401aaf22587a9365571b3a527dc9e308d9b3 100644 (file)
--- a/linux/osukiss/sender
+++ b/linux/osukiss/sender
@@ -47,13 +47,13 @@ case "$1" in
       exit 1;
       fi
     log_info_msg "Starting ${DAEMON} Server..."
-    start_daemon -f /usr/libexec/$APPNAME/${DAEMON} $OPTIONS
+    start_daemon -f /usr/libexec/$APPNAME/bin/${DAEMON} $OPTIONS
     evaluate_retval
     ;;
 
   stop)
     log_info_msg "Stopping ${DAEMON} Server..."
-    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/${DAEMON}
+    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/bin/${DAEMON}
     evaluate_retval
     rm -fr ${DAEMON_PID}
     ;;

diff --git a/linux/osukiss/sorter b/linux/osukiss/sorter
index 1936e6c78fb6b8d7491a4404bece8011287f251a..30ceca93b173737bacc36841183d0daa293e7600 100644 (file)
--- a/linux/osukiss/sorter
+++ b/linux/osukiss/sorter
@@ -48,13 +48,13 @@ case "$1" in
       exit 1;
       fi
     log_info_msg "Starting ${DAEMON} Server..."
-    start_daemon -f /usr/libexec/$APPNAME/${DAEMON} $OPTIONS
+    start_daemon -f /usr/libexec/$APPNAME/bin/${DAEMON} $OPTIONS
     evaluate_retval
     ;;
 
   stop)
     log_info_msg "Stopping ${DAEMON} Server..."
-    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/${DAEMON}
+    killproc -p ${DAEMON_PID} /usr/libexec/$APPNAME/bin/${DAEMON}
     evaluate_retval
     rm -fr ${DAEMON_PID}
     ;;

diff --git a/mailleur.spec.in b/mailleur.spec.in
index 37a36c66802f6d1a7e5a03620c91284711a2e1f7..c1046a115408d000941f6b6f5806763ad82b9413 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -196,8 +196,12 @@ case "$OS" in
     ;;
   esac
 
+#adjusting libexec bin directory
+%{__ln_s}  ./bin-posql %{_libexecdir}/%{name}/bin
+
 %postun                        postgresql
 if [ "$1" = 0 ]; then
+  rm -f %{_libexecdir}/%{name}/bin
   rm -f %{_sbindir}/receiver
   rm -f %{_sbindir}/scanner
   rm -f %{_sbindir}/sender
@@ -261,8 +265,12 @@ case "$OS" in
     ;;
   esac
 
+#adjusting libexec bin directory
+%{__ln_s}  ./bin-mysql %{_libexecdir}/%{name}/bin
+
 %postun                        mysql
 if [ "$1" = 0 ]; then
+  rm -f %{_libexecdir}/%{name}/bin
   rm -f %{_sbindir}/receiver
   rm -f %{_sbindir}/scanner
   rm -f %{_sbindir}/sender