From 16fbe72f695407bcce844dfe0bab2e28b5aa74b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 May 2013 23:36:32 +0200
Subject: [PATCH] Fix: Fedora rules

---
 build/rpm/dolibarr_fedora.spec  | 22 +++++-----------------
 build/rpm/dolibarr_generic.spec | 18 +++++++++++++++---
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index e9e907baaa5..2b380a51809 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -279,18 +279,11 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
 
 # Restart web server
 echo Restart web server
-if [ -f %{_sysconfdir}/init.d/httpd ]; then
-    %{_sysconfdir}/init.d/httpd restart
-fi
-if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-    %{_sysconfdir}/init.d/apache2 restart
-fi
+/sbin/service httpd restart
 
-# Restart mysql
-echo Restart mysql
-if [ -f /etc/init.d/mysqld ]; then
-    /etc/init.d/mysqld restart
-fi
+# Restart mysql server
+echo Restart mysql server
+/sbin/service mysqld restart
 
 # Show result
 echo
@@ -323,12 +316,7 @@ if [ "x$status" = "xpurge" ] ;
 then
     # Restart web server
     echo Restart web server
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-        %{_sysconfdir}/init.d/httpd restart
-    fi
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-        %{_sysconfdir}/init.d/apache2 restart
-    fi
+    /sbin/service httpd restart
 fi
 
 
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 0110a48e735..f15c4c96e8e 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -382,7 +382,7 @@ fi
 # If a conf already exists and its content was already completed by installer
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
-then 
+then
 	# File already exist. We add params not found.
 	echo Add new params to overwrite path to use shared libraries/fonts
 	grep -q -c "dolibarr_lib_ADODB_PATH" $config    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
@@ -447,18 +447,26 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
 
 # Restart web server
 echo Restart web server
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
+/sbin/service httpd restart
+%else
 if [ -f %{_sysconfdir}/init.d/httpd ]; then
     %{_sysconfdir}/init.d/httpd restart
 fi
 if [ -f %{_sysconfdir}/init.d/apache2 ]; then
     %{_sysconfdir}/init.d/apache2 restart
 fi
+%endif
 
-# Restart mysql
-echo Restart mysql
+# Restart mysql server
+echo Restart mysql server
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
+	/sbin/service mysqld restart
+%else
 if [ -f /etc/init.d/mysqld ]; then
     /etc/init.d/mysqld restart
 fi
+%endif
 
 # Show result
 echo
@@ -516,12 +524,16 @@ if [ "x$status" = "xpurge" ] ;
 then
     # Restart web server
     echo Restart web server
+	%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
+    /sbin/service httpd restart
+	%else
     if [ -f %{_sysconfdir}/init.d/httpd ]; then
         %{_sysconfdir}/init.d/httpd restart
     fi
     if [ -f %{_sysconfdir}/init.d/apache2 ]; then
         %{_sysconfdir}/init.d/apache2 restart
     fi
+    %endif
 fi