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 "FusionForge".
The branch, 6.0 has been updated
via d3341506967826a18e20fbb30e1ad414560bcb87 (commit)
from 6c27e897749524bea79af1b5e895492fd2057765 (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 -----------------------------------------------------------------
commit d3341506967826a18e20fbb30e1ad414560bcb87
Author: Sylvain Beucler <[email protected]>
Date: Fri Apr 24 17:56:03 2015 +0200
rpm: support manual revisions (official uploads) again
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index c432dae..dfcc227 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -1,6 +1,6 @@
Name: fusionforge
Version: @rpm_version@
-Release: @rpm_snapshot@%{?dist}
+Release: 0.1@rpm_snapshot@%{?dist}
Summary: Collaborative development tool
Group: Development/Tools
diff --git a/src/rpm/gen_spec.sh b/src/rpm/gen_spec.sh
index 671f595..c0c162e 100755
--- a/src/rpm/gen_spec.sh
+++ b/src/rpm/gen_spec.sh
@@ -22,24 +22,23 @@ version=$1
snapshot=$2
if [ -z "$version" ]; then version=$(make version); fi
-# rpm needs snapshot version separately (because 6.0+20141027 > 6.0.1, unlike
in Debian)
-tarball_version=$version
+# rpm needs snapshot version separately (because 6.0+20141027 > 6.0.1, unlike
in Debian)
+# Note: update fusionforge.spec.in:Release manually (0.1, 0.2, 1, 2...)
+rpm_snapshot=''
if echo $version | grep -q 'rc'; then
- rc=$(echo $version | sed 's/.*rc//')
rpm_version=$(echo $version | sed 's/rc.*//')
- rpm_snapshot=0.1.rc$rc
- if [ -n "$snapshot" ]; then
- tarball_version=$version+$snapshot
- rpm_snapshot=$rpm_snapshot.$snapshot
- fi
+ # Note: update fusionforge.spec.in:Release as 0.X@snapshot@ when rolling
out RCs
+ #
https://fedoraproject.org/wiki/Packaging%3aNamingGuidelines#NonNumericRelease
+ rpm_snapshot=.rc$(echo $version | sed 's/.*rc//')
else
rpm_version=$version
- rpm_snapshot=1
- if [ -n "$snapshot" ]; then
- tarball_version=$version+$snapshot
- snapshot=1.$snapshot
- fi
+fi
+
+tarball_version=$version
+if [ -n "$snapshot" ]; then
+ tarball_version=$version+$snapshot
+ rpm_snapshot=$rpm_snapshot.$snapshot
fi
rm -f fusionforge.spec
-----------------------------------------------------------------------
Summary of changes:
src/rpm/fusionforge.spec.in | 2 +-
src/rpm/gen_spec.sh | 25 ++++++++++++-------------
2 files changed, 13 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
