diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 16aaca197c1..c5e40bcfd36 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.137 2011/08/07 15:17:14 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.138 2011/08/07 18:01:14 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.137 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.138 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.1 (build $REVISION)"; @@ -579,6 +579,9 @@ if ($nboftargetok) { $ret=`$cmd`; print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n"; $cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\""; + $ret=`$cmd`; + print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n"; + $cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\""; $ret=`$cmd`; next; } diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index a1efafc8e80..95104674ce2 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__%{?dist} Summary: ERP and CRM software for small and medium companies or foundations Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Internet - Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 87ba28cc946..d7740f5bc29 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ Summary: ERP and CRM software for small and medium companies or foundations Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos @@ -21,16 +19,15 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/fedora/dolibarr-%{version}.tgz +Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build # For Mandriva-Mageia Group: Networking/WWW # For all other distrib Group: Applications/Internet - # Requires for Fedora-Redhat Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql # Requires for OpenSuse @@ -229,10 +226,8 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then echo Add SE Linux permissions for dolibarr # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" - #semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)" restorecon -R -v /etc/dolibarr - #restorecon -R -v /usr/share/dolibarr restorecon -R -v /var/lib/dolibarr fi diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 7341ab17fc9..6e9ae710589 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ Summary: ERP and CRM software for small and medium companies or foundations Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/mandriva/dolibarr-%{version}.tgz +Source0: http://www.dolibarr.org/files/mandriva/%{name}-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Networking/WWW - Requires: mysql mysql-client apache-base apache-mod_php php-cgi php-cli php-bz2 php-gd php-ldap php-imap php-mysqli php-openssl - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index c26b42651f9..6ffc9df8692 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -6,10 +6,8 @@ # edit it if you need to match your rules. # -------------------------------------------------------- -%define version __VERSION__ - Name: dolibarr -Version: %{version} +Version: __VERSION__ Release: __RELEASE__ Summary: ERP and CRM software for small and medium companies or foundations Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos @@ -21,16 +19,14 @@ License: GPLv2+ Vendor: Dolibarr dev team URL: http://www.dolibarr.org -Source0: http://www.dolibarr.org/files/opensuse/dolibarr-%{version}.tgz +Source0: http://www.dolibarr.org/files/opensuse/%{name}-%{version}.tgz BuildArch: noarch #BuildArchitectures: noarch -BuildRoot: %{_tmppath}/dolibarr-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Internet - Requires: mysql-community-server mysql-community-server-client apache2 apache2-mod_php5 php5 php5-gd php5-ldap php5-imap php5-mysql php5-openssl - # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 6e7cca9e3cc..1ae18e623cd 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -2,5 +2,4 @@ # It is provided as example to know contexts modified by installer # to make Dolibarr working. /etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 /var/lib/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file