Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

2013-10-30 09:07:14 +01:00 · 2013-10-30 09:07:14 +01:00 · 55046e2caf
commit 55046e2caf
parent ad2a8d39c5 d6b2d44350
2 changed files with 9 additions and 1 deletions
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@ -464,7 +464,11 @@ echo Restart mysql server
 	/sbin/service mysqld restart
 %else
 %if 0%{?suse_version}
+if [ -f /etc/init.d/mysqld ]; then
+    /etc/init.d/mysqld restart
+else
 	/sbin/service mysql restart
+fi
 %else
 if [ -f /etc/init.d/mysqld ]; then
    /etc/init.d/mysqld restart
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@ -288,7 +288,11 @@ fi

 # Restart mysql
 echo Restart mysql
-/sbin/service mysql restart
+if [ -f /etc/init.d/mysqld ]; then
+    /etc/init.d/mysqld restart
+else
+	/sbin/service mysql restart
+fi

 # Show result
 echo