[Gnash-commit] [SCM] Gnash branch, master, updated. 56251bea1ca80e5ec9126ff7c10daef56fce45b7

[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  56251bea1ca80e5ec9126ff7c10daef56fce45b7 (commit)
      from  085c5014c866216ec809f01a5f61cdc79b77d645 (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=56251bea1ca80e5ec9126ff7c10daef56fce45b7


commit 56251bea1ca80e5ec9126ff7c10daef56fce45b7
Author: Rob Savoye <address@hidden>
Date:   Fri Oct 1 13:16:34 2010 -0600

    fix typo in --enable-renderers, version is now master instead of trunk.

diff --git a/packaging/redhat/gnash.spec b/packaging/redhat/gnash.spec
index 9355129..ae89360 100644
--- a/packaging/redhat/gnash.spec
+++ b/packaging/redhat/gnash.spec
@@ -1,6 +1,6 @@
 Name:           gnash
 # This next field gets edited by "make gnash.spec" when building an rpm
-Version:        trunk
+Version:        master
 Release:        0
 Epoch:                 1
 # This next field gets edited by "make gnash.spec" when building an rpm
@@ -248,7 +248,7 @@ sh ./configure \
        --disable-dependency-tracking \
        --disable-testsuite \
        --disable-rpath \
-       --enable-renderers=agg,cairo \
+       --enable-renderer=agg,cairo \
        --enable-cygnal \
        --enable-python \
        --with-plugins-install=system \
diff --git a/packaging/rpm.am b/packaging/rpm.am
index 2535947..f1b0e56 100644
--- a/packaging/rpm.am
+++ b/packaging/rpm.am
@@ -78,11 +78,11 @@ rpm-install:
 setup-rpm: 
        -snapshot_version="gnash-$(SNAPSHOT_VERSION)"; \
        snapshot_version=`echo $${snapshot_version}|tr "~" "_"`; \
-       if test -d gnash-trunk; then \
-         mv gnash-trunk $${snapshot_version}; \
+       if test -d gnash-master; then \
+         mv gnash-master $${snapshot_version}; \
          if test ! -f $${snapshot_version}/configure.ac.orig; then \
            mv -f $${snapshot_version}/configure.ac 
$${snapshot_version}/configure.ac.orig; \
-           sed -e "s/AC_INIT(gnash, trunk)/AC_INIT(gnash, 
$${snapshot_version})/" \
+           sed -e "s/AC_INIT(gnash, master)/AC_INIT(gnash, 
$${snapshot_version})/" \
              $${snapshot_version}/configure.ac.orig > 
$${snapshot_version}/configure.ac; \
          fi; \
        fi; \

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

Summary of changes:
 packaging/redhat/gnash.spec |    4 ++--
 packaging/rpm.am            |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash