diff --git a/build/.cvsignore b/build/.cvsignore index a0dfb0ff8cdd13c08ef38e3ea0de48a5ae9c1e94..53dd6ee2abd15184c476b8e2cd2974e171e193b7 100644 --- a/build/.cvsignore +++ b/build/.cvsignore @@ -16,3 +16,4 @@ html *.deb *.dsc *.tar.gz +*.changes diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 56d57a6df66d87157e0edcb62ecf42e7b65f1ae4..ae04a704e10f627d23dd44bfa4b4772f157011d0 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.126 2011/07/31 17:14:03 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.127 2011/07/31 18:06:36 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> #---------------------------------------------------------------------------- @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-dev"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.126 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.127 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -418,11 +418,15 @@ if ($nboftargetok) { $ARCH='noarch'; if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; } $newbuild = $BUILD; - $newbuild =~ s/(dev|alpha)/0/gi; # dev - $newbuild =~ s/beta/1/gi; # beta - $newbuild =~ s/rc./2/gi; # rc + # For fedora + $newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev + $newbuild =~ s/beta/0.2.beta1/gi; # beta + $newbuild =~ s/rc./0.3.rc1/gi; # rc if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale - # now newbuild is 0-0 or 0-3 for example + #$newbuild =~ s/(dev|alpha)/0/gi; # dev + #$newbuild =~ s/beta/1/gi; # beta + #$newbuild =~ s/rc./2/gi; # rc + #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; @@ -709,12 +713,15 @@ if ($nboftargetok) { $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; + $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; } else { print "Move *_all.deb to $DESTI\n"; + $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`; $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`; $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`; + $ret=`mv $BUILDROOT/*.changes "$DESTI/"`; } next; } diff --git a/build/rpm/README b/build/rpm/README index f65f12cbb352e62f9475026d41d876de5a97c496..c157a195c038c71a5d0b31ea1f02d1f4bcee6f28 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -27,11 +27,13 @@ with format RPM (for Redhat, Mandriva, ...). To submit a package to Fedora: - +- Create account on bugzilla.redhat.com +- Create account on fedoraproject.org +- Create SRPMS package. +- Upload package onf http://fedorapeople.org - Create a bug with form https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review This is example of content of review field (used for Bug 723326): -Spec URL: http://www.dolibarr.org/files/fedora/dolibarr.spec -SRPM URL: http://www.dolibarr.org/files/fedora/dolibarr-3.1.0-0.src.rpm +SRPMS URL: http://www.dolibarr.org/files/fedora/dolibarr-x.y.z-xxx.src.rpm Description: Dolibarr ERP & CRM is an easy to use open source/free software for small and medium companies, foundations or freelances. It includes different features for Enterprise Resource Planning (ERP) and Customer