[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, release_0_8_9, updated. release_0_8_9
From: |
Gabriele Giacone |
Subject: |
[Gnash-commit] [SCM] Gnash branch, release_0_8_9, updated. release_0_8_9_start-211-gde8875d |
Date: |
Sun, 06 Mar 2011 03:52:58 +0000 |
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 de8875d3f8f5967ecd952aabb4dafaa01f1b3347 (commit)
from bcef8c6bcfe56f9a6c7336ed9eef227bf22c4978 (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=de8875d3f8f5967ecd952aabb4dafaa01f1b3347
commit de8875d3f8f5967ecd952aabb4dafaa01f1b3347
Author: Gabriele Giacone <address@hidden>
Date: Sun Mar 6 04:51:08 2011 +0100
Make rpm versioning follow fedora guidelines
diff --git a/packaging/rpm.am b/packaging/rpm.am
index 049e37a..50955fe 100644
--- a/packaging/rpm.am
+++ b/packaging/rpm.am
@@ -31,10 +31,13 @@ gnash.spec spec: $(srcdir)/packaging/redhat/gnash.spec
mkdir -p $(RPMBUILD_DIR); \
echo "%_topdir $(RPMBUILD_DIR)" > $(RPMMACROS); \
snapshot_version="$(SNAPSHOT_VERSION)"; \
- snapshot_version=`echo $${snapshot_version}|tr "~" "_"`; \
+ snapshot_release=`echo $${snapshot_version}|cut -d"~" -f2|sed
's/^/0.1./'`; \
+ snapshot_version=`echo $${snapshot_version}|cut -d"~" -f1`; \
+ if [ "$${snapshot_release}" = "" ];then snapshot_release=1;fi; \
distro=`lsb_release -is`; \
- echo "Editing the version in the spec file to be $${snapshot_version}
for Distribution $${distro}..."; \
+ echo "Editing the version in the spec file to be $${snapshot_version}
$${snapshot_release} for Distribution $${distro}..."; \
sed -e "s/Version.*/Version: $${snapshot_version}/" \
+ -e "s/Release.*/Release: $${snapshot_release}/" \
-e "s/Distribution:.*/Distribution: $${distro}/"
$(srcdir)/packaging/redhat/gnash.spec > $(RPMSPEC)
@@ -83,7 +86,7 @@ rpm-install:
# before rpmbuild will work.
setup-rpm:
snapshot_version="$(SNAPSHOT_VERSION)"; \
- snapshot_dir="gnash-`echo $${snapshot_version}|tr "~" "_"`"; \
+ snapshot_dir="gnash-`echo $${snapshot_version}|cut -d"~" -f1`"; \
if test $${snapshot_dir} != $(SNAPSHOT_DIR); then \
rm -fr $${snapshot_dir}; \
mv -f $(SNAPSHOT_DIR) $${snapshot_dir}; \
-----------------------------------------------------------------------
Summary of changes:
packaging/rpm.am | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, release_0_8_9, updated. release_0_8_9_start-211-gde8875d,
Gabriele Giacone <=