[Gnash-commit] [SCM] Gnash branch, master, updated. 72ca79255f52a67c5e323abd1b7748a6214b7f7e

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  72ca79255f52a67c5e323abd1b7748a6214b7f7e (commit)
       via  3d1699b83689000fd27d763d04a26a310b800ac6 (commit)
      from  06d5ce9c54e579ad60f6653f4cd84c5a4ef861c2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=72ca79255f52a67c5e323abd1b7748a6214b7f7e


commit 72ca79255f52a67c5e323abd1b7748a6214b7f7e
Merge: 3d1699b 06d5ce9
Author: Rob Savoye <address@hidden>
Date:   Sun Dec 19 10:33:56 2010 -0700

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=3d1699b83689000fd27d763d04a26a310b800ac6


commit 3d1699b83689000fd27d763d04a26a310b800ac6
Author: Rob Savoye <address@hidden>
Date:   Sun Dec 19 10:33:21 2010 -0700

    remove --sign so rpmbuild runs without blocking for a gpg key

diff --git a/packaging/rpm.am b/packaging/rpm.am
index 9e10cef..7a37e3b 100644
--- a/packaging/rpm.am
+++ b/packaging/rpm.am
@@ -44,9 +44,10 @@ gnash.spec spec: $(srcdir)/packaging/redhat/gnash.spec
 # Do the entire process to build an RPM package
 rpm: distdir spec setup-rpm rpm-gnash
 
-# build everything in one pass using rpmbuild
+# build everything in one pass using rpmbuild. This was using
+# --sign gnash.spec, but it didn't work for the automated builds.
 rpm-gnash: 
-       rpmbuild -ba $(RPMBUILD_FLAGS) --sign gnash.spec
+       rpmbuild -ba $(RPMBUILD_FLAGS) gnash.spec
 
 # configure the build directory, which we do by executing only the %prep stage,
 # which doesn't actually run configure

-----------------------------------------------------------------------

Summary of changes:
 packaging/rpm.am |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash