From f1466e64afda19f1275c8bb5278aaebf412529ac Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Apr 2014 09:12:49 +0200 Subject: [PATCH] Fix: Build for obs --- build/rpm/dolibarr_generic.spec | 12 ++++++++++-- build/rpm/dolibarr_opensuse.spec | 5 +++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 8a9d4de92fb5c..1b0ac32496201 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -305,6 +305,11 @@ done >>%{name}.lang %post echo Run post script of packager dolibarr_generic.spec +echo Detected constant fedora=0%{?fedora} +echo Detected constant rhel_version=0%{?rhel_version} +echo Detected constant centos_version=0%{?centos_version} +echo Detected constant mdkversion=0%{?mdkversion} +echo Detected constant suse_version=0%{?suse_version} # Define vars export docdir="/var/lib/dolibarr/documents" @@ -465,9 +470,12 @@ echo Restart mysql server %else %if 0%{?suse_version} if [ -f /etc/init.d/mysqld ]; then - /etc/init.d/mysqld restart -else + /sbin/service mysqld restart + #/etc/init.d/mysqld restart +fi +if [ -f /etc/init.d/mysql ]; then /sbin/service mysql restart + #/etc/init.d/mysql restart fi %else if [ -f /etc/init.d/mysqld ]; then diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index ae1f1668bd571..7e5e21e009d71 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -289,8 +289,9 @@ fi # Restart mysql echo Restart mysql if [ -f /etc/init.d/mysqld ]; then - /etc/init.d/mysqld restart -else + /sbin/service mysqld restart +fi +if [ -f /etc/init.d/mysql ]; then /sbin/service mysql restart fi