On Fri, May 04, 2018 at 03:14:04PM +0200, Andrea Bolognani wrote: > On Fri, 2018-05-04 at 13:38 +0100, Daniel P. Berrangé wrote: > > On Fri, May 04, 2018 at 02:20:25PM +0200, Andrea Bolognani wrote: > [...] > > > if [ -f /usr/bin/rpmbuild ]; then > > > - if [ -n "$AUTOBUILD_COUNTER" ]; then > > > - EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" > > > - else > > > - NOW=`date +"%s"` > > > - EXTRA_RELEASE=".$USER$NOW" > > > - fi > > > + NOW=`date +"%s"` > > > + EXTRA_RELEASE=".$USER$NOW" > > > rpmbuild --nodeps -ta --define "extra_release $EXTRA_RELEASE" --clean $NAME-*.tar.gz > > > fi > > > > We can actually chop the 'extra_release' bit out of the RPM spec > > entirely, as it is only useful for automated CI builds. > > Neat. I assume you meant that we can avoid defining it when calling > rpmbuild in the script, not that we want to remove it from the spec > altogether, right? The latter can still be useful. I did actually mean removing it from the RPM spec entirely - Fedora reviewers have complained about it existing multiple times, but at least in past I could justify it for CI purposes. > > Can I just squash in the following diff and push, or do you want me > to respin? > > > diff --git a/prepare-release.sh b/prepare-release.sh > index 22f9155..25a5cda 100755 > --- a/prepare-release.sh > +++ b/prepare-release.sh > @@ -52,9 +52,7 @@ rm -f $NAME-*.tar.gz > make dist > > if [ -f /usr/bin/rpmbuild ]; then > - NOW=`date +"%s"` > - EXTRA_RELEASE=".$USER$NOW" > - rpmbuild --nodeps -ta --define "extra_release $EXTRA_RELEASE" --clean $NAME-*.tar.gz > + rpmbuild --nodeps -ta --clean $NAME-*.tar.gz > fi > > # Skip debian pkg for now > -- > Andrea Bolognani / Red Hat / Virtualization Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
