Skip to content

Commit

Permalink
Fix version number generation
Browse files Browse the repository at this point in the history
  • Loading branch information
fihuer committed Feb 7, 2023
1 parent 1f305aa commit 51fbeeb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
10 changes: 6 additions & 4 deletions auks.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Version: %(echo @PACKAGE_VERSION@ | cut -f 1 -d -)
Release: %(echo @PACKAGE_VERSION@ | cut -f 2- -d - | tr - _)%{?dist}
License: CeCILL-C License
Group: System Environment/Base
URL: http://sourceforge.net/projects/auks/
Source0: @PACKAGE_NAME@-@[email protected]
URL: https://github.com/cea-hpc/auks
Source0: https://github.com/cea-hpc/auks/archive/refs/tags/@[email protected] #/@PACKAGE_NAME@-@[email protected]


# For kerberos prior to 1.8, you should define
Expand Down Expand Up @@ -73,9 +73,9 @@ for the AUKS API.
%package slurm
Summary: Slurm plugins for Auks
Group: System Environment/Base
Requires: slurm >= 20.11.0
Requires: slurm >= 22.05.3
Requires: auks >= %{version}
BuildRequires: slurm-devel >= 20.11.0
BuildRequires: slurm-devel >= 22.05.3
%description slurm
Plugins that provides Kerberos Credential Support to Slurm
%endif
Expand Down Expand Up @@ -178,6 +178,8 @@ install -D -m644 src/plugins/slurm/slurm-spank-auks.conf ${RPM_BUILD_ROOT}/etc/s
%endif

%changelog
* Tue Feb 07 2023 Romain Fihue <[email protected]> - 0.5.4-1
- 0.5.4 Release
* Tue Jan 11 2022 Matthieu Hautreux <[email protected]> - 0.5.3-1
- adapted to auks version 0.5.3
* Tue Jun 16 2020 Matthieu Hautreux <[email protected]> - 0.5.0-1
Expand Down
6 changes: 3 additions & 3 deletions build-aux/git-version-gen
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
# Print a version string.
scriptversion=2022-09-15.15; # UTC
scriptversion=2023-02-07.14; # UTC

# Copyright (C) 2007-2010 Free Software Foundation, Inc.
#
Expand Down Expand Up @@ -102,8 +102,8 @@ then
# directory, and "git describe" output looks sensible, use that to
# derive a version string.
elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
&& v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
|| git describe --abbrev=4 HEAD 2>/dev/null` \
&& v=`git describe --abbrev=4 --match='v*' --long HEAD 2>/dev/null \
|| git describe --abbrev=4 --long HEAD 2>/dev/null` \
&& v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
&& case $v in
v[0-9]*) ;;
Expand Down

0 comments on commit 51fbeeb

Please sign in to comment.