[Gnash-commit] [SCM] Gnash branch, release_0_8_9, updated. release_0_8_9_start-165-g14a3366

[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, release_0_8_9 has been updated
       via  14a33664ec4449aa67a7eac8a64ca20b17b6ad00 (commit)
       via  5fb1ca32b837d661bc631311f9cd81d8a794e42f (commit)
       via  4df2a762b007781cd0e6bc4c3133971da6bb0653 (commit)
      from  e9879feda67bd5ed644a252198a9c7f7111a1a28 (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=14a33664ec4449aa67a7eac8a64ca20b17b6ad00


commit 14a33664ec4449aa67a7eac8a64ca20b17b6ad00
Author: Rob Savoye <address@hidden>
Date:   Thu Feb 24 20:26:47 2011 -0700

    rename the builkd directory so we get the full version number for everything

diff --git a/packaging/rpm.am b/packaging/rpm.am
index 8e5e451..bd9c524 100644
--- a/packaging/rpm.am
+++ b/packaging/rpm.am
@@ -81,12 +81,18 @@ rpm-install:
 # Unlike creating a deb, which build their own source tarball, rpm
 # requires we do it ourselves, and copy it to $HOME/rpmbuild/SOURCES
 # before rpmbuild will work.
-setup-rpm: 
-       tar zcf $(SNAPSHOT_DIR).tar.gz \
-         --exclude=$(SNAPSHOT_DIR)/autom4te.cache \
-         --exclude=$(SNAPSHOT_DIR)/configure.ac.orig \
-         --exclude=$(SNAPSHOT_DIR)/configure.orig $(SNAPSHOT_DIR); \
+setup-rpm: snapshot-rename-build
+       snapshot_version="$(SNAPSHOT_VERSION)"; \
+       snapshot_dir="gnash-`echo $${snapshot_version}|tr "~" "_"`"; \
+       if test $${snapshot_dir} != $(SNAPSHOT_DIR); then \
+         rm -fr $${snapshot_dir}; \
+         mv -f $(SNAPSHOT_DIR) $${snapshot_dir}; \
+       fi; \
+       tar zcf $${snapshot_dir}.tar.gz \
+         --exclude=$${snapshot_dir}/autom4te.cache \
+         --exclude=$${snapshot_dir}/configure.ac.orig \
+         --exclude=$${snapshot_dir}/configure.orig $${snapshot_dir}; \
        mkdir -p $(RPMBUILD_DIR)/SOURCES; \
-       cp $(SNAPSHOT_DIR).tar.gz $(RPMBUILD_DIR)/SOURCES
+       cp $${snapshot_dir}.tar.gz $(RPMBUILD_DIR)/SOURCES
 
 .PHONY : rpm redhat spec rpm-configure rpm-install rpm-build setup-rpm

http://git.savannah.gnu.org/cgit//commit/?id=5fb1ca32b837d661bc631311f9cd81d8a794e42f


commit 5fb1ca32b837d661bc631311f9cd81d8a794e42f
Author: Rob Savoye <address@hidden>
Date:   Thu Feb 24 20:26:06 2011 -0700

    add a tilde so versioning works correctly

diff --git a/packaging/snapshot.am b/packaging/snapshot.am
index 68b492c..22b829c 100644
--- a/packaging/snapshot.am
+++ b/packaging/snapshot.am
@@ -26,7 +26,7 @@ BRANCH_NICK   = "`if test -f revno.h; then grep "NICK" 
revno.h | cut -d '"' -f 2
 
 # this is used for Debian style naming conventions
 NEXT_RELEASE = 0.8.10
-SNAPSHOT_VERSION := 0.8.9rc2
+SNAPSHOT_VERSION := 0.8.9~rc2
 #SNAPSHOT_VERSION = $(NEXT_RELEASE)~git.$(BRANCH_NICK)$(BRANCH_REVNO)
 
 # these is the directories where the snapshot gets built. Sources are

http://git.savannah.gnu.org/cgit//commit/?id=4df2a762b007781cd0e6bc4c3133971da6bb0653


commit 4df2a762b007781cd0e6bc4c3133971da6bb0653
Author: Rob Savoye <address@hidden>
Date:   Thu Feb 24 20:25:37 2011 -0700

    don't put rc2 into the version, it screws up RPM building. Fix this 
elsewhere in the process.

diff --git a/configure.ac b/configure.ac
index 014520d..20483a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, 
MA  02110-1301  USA
 dnl  
 
 AC_PREREQ(2.50)
-AC_INIT(gnash, 0.8.9rc2)
+AC_INIT(gnash, 0.8.9)
 AC_CONFIG_SRCDIR([libcore/as_object.h])
 AC_CONFIG_HEADERS([gnashconfig.h])
 AC_CONFIG_MACRO_DIR([macros])

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

Summary of changes:
 configure.ac          |    2 +-
 packaging/rpm.am      |   18 ++++++++++++------
 packaging/snapshot.am |    2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Gnash