From f786d7b9886896f9ee35505f3fea5d14d14a4013 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 3 Sep 2011 01:27:00 +0000 Subject: [PATCH] Work on rpm package --- build/makepack-dolibarr.pl | 1 - build/rpm/dolibarr_fedora.spec | 4 ++-- build/rpm/dolibarr_generic.spec | 4 ++-- build/rpm/dolibarr_mandriva.spec | 4 ++-- build/rpm/dolibarr_opensuse.spec | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 49237a3822067..c46b6d705c388 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -572,7 +572,6 @@ print "Copy patch file to $RPMDIR/SOURCES\n"; $ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`; - $ret=`chmod 644 $RPMDIR/SOURCES/dolibarr-forrpm.patch`; print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n"; #$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index c7d80b32f128f..ee92354ea4940 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -195,13 +195,13 @@ fi # Show result echo -echo "----- Dolibarr %version-%release - (c) Dolibarr dev team -----" +echo "----- Dolibarr %version - (c) Dolibarr dev team -----" echo "Dolibarr files are now installed (into /usr/share/dolibarr)." echo "To finish installation and use Dolibarr, click on the menu" echo "entry Dolibarr ERP-CRM or call the following page from your" echo "web browser:" echo "http://localhost/dolibarr/" -echo "-------------------------------------------------------" +echo "--------------------------------------------------" echo diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 9e82c9f8611e2..5152483b90da5 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -259,7 +259,7 @@ fi # Show result echo -echo "----- Dolibarr %version-%release - (c) Dolibarr dev team -----" +echo "----- Dolibarr %version - (c) Dolibarr dev team -----" echo "Dolibarr files are now installed (into /usr/share/dolibarr)." echo "To finish installation and use Dolibarr, click on the menu" echo "entry Dolibarr ERP-CRM or call the following page from your" @@ -316,5 +316,5 @@ fi %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 937a0c8511638..998cfab10d07f 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -185,7 +185,7 @@ fi # Show result echo -echo "----- Dolibarr %version-%release - (c) Dolibarr dev team -----" +echo "----- Dolibarr %version - (c) Dolibarr dev team -----" echo "Dolibarr files are now installed (into /usr/share/dolibarr)." echo "To finish installation and use Dolibarr, click on the menu" echo "entry Dolibarr ERP-CRM or call the following page from your" @@ -225,5 +225,5 @@ fi %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 90edf95845c84..f8e6479257fe1 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -189,7 +189,7 @@ fi # Show result echo -echo "----- Dolibarr %version-%release - (c) Dolibarr dev team -----" +echo "----- Dolibarr %version - (c) Dolibarr dev team -----" echo "Dolibarr files are now installed (into /usr/share/dolibarr)." echo "To finish installation and use Dolibarr, click on the menu" echo "entry Dolibarr ERP-CRM or call the following page from your" @@ -229,5 +229,5 @@ fi %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 - Initial version (#723326)