[libnet-dbus-perl] 95/335: Ensure autobuilt RPMs include builder counter / timestamp to differentiate from formal builds

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch experimental
in repository libnet-dbus-perl.

commit ec4f326e1fddc30716fe7ba2640084a827f1e896
Author: Daniel P. Berrange <dan at berrange.com>
Date:   Fri Sep 2 13:24:57 2005 +0000

    Ensure autobuilt RPMs include builder counter / timestamp to differentiate from formal builds
---
 Net-DBus.spec.PL |  6 ++++--
 rollingbuild.sh  | 33 ++++++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/Net-DBus.spec.PL b/Net-DBus.spec.PL
index 065af48..20692c3 100644
--- a/Net-DBus.spec.PL
+++ b/Net-DBus.spec.PL
@@ -1,6 +1,6 @@
 # Copyright (C) 2001-2004 Daniel Berrange <dan at berrange.com>
 #
-# $Id: Net-DBus.spec.PL,v 1.5 2005/08/22 13:33:00 dan Exp $
+# $Id: Net-DBus.spec.PL,v 1.6 2005/09/02 14:24:57 dan Exp $
 
 use strict;
 
@@ -36,10 +36,12 @@ __DATA__
 %define perlversion %(perl -e 'use Config; print $Config{version}')
 %define appname Net-DBus
 
+%define _extra_release %{?extra_release:%{extra_release}}
+
 Summary: Perl API to the DBus message system
 Name: perl-%{appname}
 Version: @VERSION@
-Release: 1
+Release: 1%{_extra_release}
 Copyright: GPL/Artistic
 Group: Applications/Internet
 Source: %{appname}-%{version}.tar.gz
diff --git a/rollingbuild.sh b/rollingbuild.sh
index 76a1997..bf6949e 100755
--- a/rollingbuild.sh
+++ b/rollingbuild.sh
@@ -23,16 +23,21 @@ echo $NAME.spec >> MANIFEST
 # Build the RPM.
 make
 
-perl -MDevel::Cover -e '' 1>/dev/null 2>&1 && USE_COVER=1 || USE_COVER=0
-if [ "$USE_COVER" = "1" ]; then
-  cover -delete
-  HARNESS_PERL_SWITCHES=-MDevel::Cover make test
-  cover
-  mkdir blib/coverage
-  cp -a cover_db/*.html cover_db/*.css blib/coverage
-  mv blib/coverage/coverage.html blib/coverage/index.html
-else
-  make test
+if [ -z "$USE_COVER" ]; then
+  perl -MDevel::Cover -e '' 1>/dev/null 2>&1 && USE_COVER=1 || USE_COVER=0
+fi
+
+if [ -z "$SKIP_TESTS" -o "$SKIP_TESTS" = "0" ]; then
+  if [ "$USE_COVER" = "1" ]; then
+    cover -delete
+    HARNESS_PERL_SWITCHES=-MDevel::Cover make test
+    cover
+    mkdir blib/coverage
+    cp -a cover_db/*.html cover_db/*.css blib/coverage
+    mv blib/coverage/coverage.html blib/coverage/index.html
+  else
+    make test
+  fi
 fi
 
 make install
@@ -41,7 +46,13 @@ rm -f $NAME-*.tar.gz
 make dist
 
 if [ -f /usr/bin/rpmbuild ]; then
-  rpmbuild -ta --clean $NAME-*.tar.gz
+  if [ -n "$AUTOBUILD_COUNTER" ]; then
+    EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER"
+  else
+    NOW=`date +"%s"`
+    EXTRA_RELEASE=".$USER$NOW"
+  fi
+  rpmbuild -ta --define "extra_release $EXTRA_RELEASE" --clean $NAME-*.tar.gz
 fi
 
 # Skip debian pkg for now

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libnet-dbus-perl.git