From 38dbf7468886b35195803a1b6635127e9ed906ef Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 19 Oct 2012 01:37:48 +0200 Subject: [PATCH] Fix: Perm on files --- build/rpm/dolibarr_fedora.spec | 2 +- build/rpm/dolibarr_generic.spec | 11 ++++++++++- build/rpm/dolibarr_mandriva.spec | 2 +- build/rpm/dolibarr_opensuse.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index f3cdc1d0077..7b34a563bdb 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -195,7 +195,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/*.php %_datadir/dolibarr/htdocs/*.txt -%defattr(0664, -, -) +%defattr(0664, root, apache) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 0a0c77bd154..609fbff49e5 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -52,6 +52,7 @@ Requires: apache-base, apache-mod_php, php-cgi, php-cli, php-bz2, php-gd, php-ld Requires: mysql, mysql-client %else %if 0%{?suse_version} +# Voir http://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros Group: Productivity/Office/Management Requires: apache2, apache2-mod_php5, php5 >= 5.3.0, php5-gd, php5-ldap, php5-imap, php5-mysql, php5-openssl, fonts-ttf-dejavu Requires: mysql-community-server, mysql-community-server-client @@ -260,7 +261,15 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/*.php %_datadir/dolibarr/htdocs/*.txt -%defattr(0664, -, -) +%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} +%defattr(0664, root, apache) +%else +%if 0%{?suse_version} +%defattr(0664, root, www) +%else +%defattr(0664, root, -) +%endif +%endif %config(noreplace) %{_sysconfdir}/dolibarr/conf.php %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index c5b881ac7ea..e98a416b8dc 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -192,7 +192,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/*.php %_datadir/dolibarr/htdocs/*.txt -%defattr(0664, -, -) +%defattr(0664, root, apache) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 5c282829116..3d8062ae808 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -197,7 +197,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/*.php %_datadir/dolibarr/htdocs/*.txt -%defattr(0664, -, -) +%defattr(0664, root, www) %config(noreplace) %{_sysconfdir}/dolibarr/conf.php %config(noreplace) %{_sysconfdir}/dolibarr/apache.conf %config(noreplace) %{_sysconfdir}/dolibarr/install.forced.php