Skip to content
Snippets Groups Projects
Commit fd41ea8a authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

RPM works alos on ubuntu and debian

parent 8b818ce1
No related branches found
No related tags found
No related merge requests found
...@@ -32,7 +32,8 @@ Group: Networking/WWW ...@@ -32,7 +32,8 @@ Group: Networking/WWW
Group: Applications/Internet Group: Applications/Internet
Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql
AutoReqProv: yes # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse)
AutoReqProv: no
%description %description
...@@ -103,17 +104,6 @@ cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr ...@@ -103,17 +104,6 @@ cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr
cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr
cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr
# menu
#%{__install} -d $RPM_BUILD_ROOT%{_menudir}
#%{__cat} <<EOF >$RPM_BUILD_ROOT%{_menudir}/%{name}
#?package(%{name}):\
#command="Dolibarr" \
#section="Office" \
#title="Dolibarr" \
#icon="dolibarr_48x48.png" \
#longtitle="Dolibarr ERP & CRM"
#EOF
#---- clean #---- clean
%clean %clean
...@@ -181,19 +171,26 @@ fi ...@@ -181,19 +171,26 @@ fi
# Detect OS # Detect OS
os='fedora'; os='fedora-redhat';
if [ -d %{_sysconfdir}/httpd/conf.d ]; then if [ -d %{_sysconfdir}/httpd/conf.d ]; then
export os='fedora'; export os='fedora-redhat';
export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
apacheuser='apache'; export apacheuser='apache';
apachegroup='apache'; export apachegroup='apache';
fi fi
if [ -d %{_sysconfdir}/apache2/conf.d ]; then if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then
export os='opensuse'; export os='opensuse';
export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
apacheuser='wwwrun'; export apacheuser='wwwrun';
apachegroup='wwwrun'; export apachegroup='wwwrun';
fi
if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then
export os='ubuntu-debian';
export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
export apacheuser='www-data';
export apachegroup='www-data';
fi fi
echo OS detected: $os
# Create a config link dolibarr.conf for Fedora or Redhat # Create a config link dolibarr.conf for Fedora or Redhat
if [ ! -f $conffile ]; then if [ ! -f $conffile ]; then
...@@ -214,11 +211,11 @@ chmod -R o-w $docdir ...@@ -214,11 +211,11 @@ chmod -R o-w $docdir
if [ ! -s $targetdir/htdocs/conf/conf.php ]; then if [ ! -s $targetdir/htdocs/conf/conf.php ]; then
echo Create empty Dolibarr conf.php file echo Create empty Dolibarr conf.php file
touch $targetdir/htdocs/conf/conf.php touch $targetdir/htdocs/conf/conf.php
chown apache.apache $targetdir/htdocs/conf/conf.php chown $apacheuser:$apachegroup $targetdir/htdocs/conf/conf.php
chmod ug+rw $targetdir/htdocs/conf/conf.php chmod ug+rw $targetdir/htdocs/conf/conf.php
fi fi
if [ "x$os" = "xfedora" -a -s /usr/bin/chcon ]; then if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then
echo Set SELinux permissions echo Set SELinux permissions
# Warning: chcon seems not cumulative # Warning: chcon seems not cumulative
#chcon -R -h -t httpd_sys_content_t $targetdir #chcon -R -h -t httpd_sys_content_t $targetdir
...@@ -253,16 +250,26 @@ echo ...@@ -253,16 +250,26 @@ echo
%clean_menus %clean_menus
# Detect OS # Detect OS
os='fedora'; os='fedora-redhat';
if [ -d %{_sysconfdir}/httpd/conf.d ]; then if [ -d %{_sysconfdir}/httpd/conf.d ]; then
export os='fedora'; export os='fedora-redhat';
export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export conffile="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
export apacheuser='apache';
export apachegroup='apache';
fi fi
if [ -d %{_sysconfdir}/apache2/conf.d ]; then if [ -d %{_sysconfdir}/apache2/conf.d -a `grep wwwrun /etc/passwd` ]; then
export os='opensuse'; export os='opensuse';
export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
export apacheuser='wwwrun';
export apachegroup='wwwrun';
fi fi
if [ -d %{_sysconfdir}/apache2/conf.d -a `grep www-data /etc/passwd` ]; then
export os='ubuntu-debian';
export conffile="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
export apacheuser='www-data';
export apachegroup='www-data';
fi
echo OS detected: $os
# Dolibarr files are stored into /var/www # Dolibarr files are stored into /var/www
export targetdir='/var/www/dolibarr' export targetdir='/var/www/dolibarr'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment