Fix: Building on obs

This commit is contained in:
Laurent Destailleur 2014-04-01 09:08:52 +02:00
parent d2cb5e8d2d
commit d452624ebc
4 changed files with 17 additions and 8 deletions

View File

@ -331,7 +331,7 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog %changelog
* Fri Feb 7 2014 Laurent Destailleur 3.6.0-0.2.b * Fri Feb 21 2014 Laurent Destailleur 3.6.0-0.2.b
- Upstream release - Upstream release
* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 * Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3

View File

@ -306,6 +306,11 @@ done >>%{name}.lang
%post %post
echo Run post script of packager dolibarr_generic.spec 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 # Define vars
export docdir="/var/lib/dolibarr/documents" export docdir="/var/lib/dolibarr/documents"
@ -466,9 +471,12 @@ echo Restart mysql server
%else %else
%if 0%{?suse_version} %if 0%{?suse_version}
if [ -f /etc/init.d/mysqld ]; then if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart /sbin/service mysqld restart
else #/etc/init.d/mysqld restart
fi
if [ -f /etc/init.d/mysql ]; then
/sbin/service mysql restart /sbin/service mysql restart
#/etc/init.d/mysql restart
fi fi
%else %else
if [ -f /etc/init.d/mysqld ]; then if [ -f /etc/init.d/mysqld ]; then
@ -559,7 +567,7 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog %changelog
* Mon Feb 7 2014 Laurent Destailleur 3.6.0-0.2.b * Mon Feb 21 2014 Laurent Destailleur 3.6.0-0.2.b
- Upstream release - Upstream release
* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 * Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3

View File

@ -336,7 +336,7 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog %changelog
* Mon Feb 7 2014 Laurent Destailleur 3.6.0-0.2.b * Mon Feb 21 2014 Laurent Destailleur 3.6.0-0.2.b
- Upstream release - Upstream release
* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 * Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3

View File

@ -290,8 +290,9 @@ fi
# Restart mysql # Restart mysql
echo Restart mysql echo Restart mysql
if [ -f /etc/init.d/mysqld ]; then if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart /sbin/service mysqld restart
else fi
if [ -f /etc/init.d/mysql ]; then
/sbin/service mysql restart /sbin/service mysql restart
fi fi
@ -346,7 +347,7 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog %changelog
* Mon Feb 7 2014 Laurent Destailleur 3.6.0-0.2.b * Mon Feb 21 2014 Laurent Destailleur 3.6.0-0.2.b
- Upstream release - Upstream release
* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 * Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3