From fae0074c94870b66d92d3361695b4c5ecf2e2dc7 Mon Sep 17 00:00:00 2001
From: Morgan Rodgers <mrodgers@osc.edu>
Date: Tue, 13 Aug 2019 10:04:19 -0400
Subject: [PATCH] Update spec file for CI/CD
---
packaging/ondemand-bc_osc_matlab.spec | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/packaging/ondemand-bc_osc_matlab.spec b/packaging/ondemand-bc_osc_matlab.spec
index 08f3710..466ed4e 100644
--- a/packaging/ondemand-bc_osc_matlab.spec
+++ b/packaging/ondemand-bc_osc_matlab.spec
@@ -2,16 +2,20 @@
%global debug_package %{nil}
%global repo_name bc_osc_matlab
%global app_name bc_osc_matlab
+%{!?package_version: %define package_version %{major}.%{minor}.%{patch}}
+%{!?package_release: %define package_release 1}
+%{!?git_tag: %define git_tag v%{package_version}}
+%define git_tag_minus_v %(echo %{git_tag} | sed -r 's/^v//')
Name: ondemand-%{app_name}
-Version: 0.4.0
-Release: 1%{?dist}
+Version: %{package_version}
+Release: %{package_release}%{?dist}
Summary: SUMMARY
Group: System Environment/Daemons
License: MIT
URL: https://github.com/OSC/%{repo_name}
-Source0: https://github.com/OSC/%{repo_name}/archive/v%{version}.tar.gz
+Source0: https://github.com/OSC/%{repo_name}/archive/%{git_tag}.tar.gz
Requires: ondemand
@@ -23,7 +27,7 @@ AutoReqProv: no
DESCRIPTION
%prep
-%setup -q -n %{repo_name}-%{version}
+%setup -q -n %{repo_name}-%{git_tag_minus_v}
%build
--
GitLab