Update spec and nightly build script for v5.0-rc1

gluster · Oct 12, 2018 · 42333b4 · 42333b4
1 parent 908d0f2
commit 42333b4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/extras/nightly-rpms.sh b/extras/nightly-rpms.sh
@@ -54,19 +54,20 @@ popd #GD2SRC
 
 pushd "$BUILDDIR"
 
-DISTARCHIVE="glusterd2-$FULL_VERSION-vendor.tar.xz"
+DISTBASE="glusterd2-$FULL_VERSION"
+DISTARCHIVE="$DISTBASE-vendor.tar.xz"
 SPEC=glusterd2.spec
 sed -i -E "
 # Use bundled always
 s/with_bundled 0/with_bundled 1/;
 # Replace version with HEAD version
 s/^Version:[[:space:]]+([0-9]+\\.)*[0-9]+$/Version: $VERSION/;
 # Replace release with proper release
-s/^Release:[[:space:]]+.*%\\{\\?dist\\}/Release: $RELEASE%{?dist}/;
+s/^Release:[[:space:]]+.*%\\{\\?dist\\}/Release: 0.$RELEASE%{?dist}/;
 # Replace Source0 with generated archive
-s/^Source0:[[:space:]]+.*-vendor.tar.xz/Source0: $DISTARCHIVE/;
+s/^Source0:[[:space:]]+.*.tar.xz/Source0: $DISTARCHIVE/;
 # Change prep setup line to use correct release
-s/^(%setup -q -n %\\{name\\}-v%\\{gd2version\\}-)(%\\{gd2release\\})/\\1$RELEASE/;
+s/^%setup -q -n .*$/%setup -q -n $DISTBASE/;
 " $SPEC
 
 ##

diff --git a/extras/rpms/glusterd2.spec b/extras/rpms/glusterd2.spec
@@ -23,20 +23,19 @@
 
 %global gd2make %{__make} PREFIX=%{_prefix} EXEC_PREFIX=%{_exec_prefix} BINDIR=%{_bindir} SBINDIR=%{_sbindir} DATADIR=%{_datadir} LOCALSTATEDIR=%{_sharedstatedir} LOGDIR=%{_localstatedir}/log SYSCONFDIR=%{_sysconfdir} FASTBUILD=off
 
-%global gd2version 5.0.0
-%global gd2release rc0
+%global gd2version 5.0
+# gd2prerel is only used for pre-releases. Comment it out for normal releases
+%global gd2prerel rc1
+# gd2tarbase is the base name for the GD2 source tarball
+%global gd2tarbase glusterd2-v%{gd2version}-%{!?gd2prerel:0}%{?gd2prerel}
 
 Name: %{repo}
 Version: %{gd2version}
-Release: %{gd2release}%{?dist}
+Release: 0%{?gd2prerel:.%{gd2prerel}}%{?dist}
 Summary: The GlusterFS management daemon (preview)
 License: GPLv2 or LGPLv3+
 URL: https://%{provider_prefix}
-%if 0%{?with_bundled}
-Source0: https://%{provider_prefix}/releases/download/v%{version}/%{name}-v%{gd2version}-%{gd2release}-vendor.tar.xz
-%else
-Source0: https://%{provider_prefix}/releases/download/v%{version}/%{name}-v%{gd2version}-%{gd2release}.tar.xz
-%endif
+Source0: https://%{provider_prefix}/releases/download/v%{gd2version}%{?gd2prerel:-%{gd2prerel}}/%{gd2tarbase}%{?with_bundled:-vendor}.tar.xz
 Source1: glusterd2-logrotate
 
 ExclusiveArch: %{go_arches}
@@ -76,15 +75,15 @@ BuildRequires: golang(google.golang.org/grpc)
 BuildRequires: golang(go.opencensus.io)
 %endif
 
-Requires: glusterfs-server >= 5.0.0
+Requires: glusterfs-server >= 5.0
 Requires: /usr/bin/strings
 %{?systemd_requires}
 
 %description
 The new GlusterFS management framework and daemon, for GlusterFS-4.0.
 
 %prep
-%setup -q -n %{name}-v%{gd2version}-%{gd2release}
+%setup -q -n %{gd2tarbase}
 
 %build
 export GOPATH=$(pwd):%{gopath}