[mythtv] Update to latest fixes/31. Auto compute the version string soley from git describe

commit d3a6e45bee2c4c2e0a2797c988bbd0ff2af6bcd5 Author: Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; Date: Wed Apr 21 09:28:29 2021 -0500 Update to latest fixes/31. Auto compute the version string soley from git describe .gitignore | 1 + mythtv.spec | 28 +++++++++++++++++----------- sources | 1 + 3 files changed, 19 insertions(+), 11 deletions(-) --- diff --git a/.gitignore b/.gitignore index 86a474d..9c4d5b3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ mythtv-0.27.5.tar.gz /v30.0..b774c4140b.patch /mythtv-31.0.tar.gz /v31.0..016630a35c.patch +/v31.0..05c16580e1.patch diff --git a/mythtv.spec b/mythtv.spec index 06ea586..ef5bb10 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -1,4 +1,5 @@ -%define _lto_cflags %{nil} +# The full MythTV Version string is computed from the output of git describe. +%global vers_string v31.0-147-g05c16580e1 # Specfile for building MythTV and MythPlugins RPMs from a git checkout. # @@ -52,18 +53,19 @@ # ################################################################################ +%define _lto_cflags %{nil} -# A list of which applications we want to put into the desktop menu system -%global desktop_applications mythfrontend mythtv-setup +# The build date is today +%global bld_date %(date +"%Y%m%d") -# git has used to fetch fixes diff -%global githash b6ddf202a496dac180218a6581344251804f2086 -%global shorthash %(c=%{githash}; echo ${c:0:10}) +# These values are computed from git describe provided earlier +%global githash %(c=%{vers_string}; echo $c|cut -d"-" -f3) +%global shorthash %(c=%{githash}; echo ${c:1:11}) +%global commits %(c=%{vers_string}; echo $c|cut -d"-" -f2) +%global rel_string .%{commits}.%{bld_date}git%{shorthash} -# MythTV Version string -- preferably the output from git describe -%global vers_string v31.0-139-gb6ddf202a4 -%global rel_date 20210226 -%global rel_string .139.20210226gitb6ddf202a4 +# A list of which applications we want to put into the desktop menu system +%global desktop_applications mythfrontend mythtv-setup %global branch fixes/31 @@ -72,7 +74,7 @@ # Name: mythtv Version: 31.0 -Release: 16%{rel_string}%{?dist} +Release: 17%{rel_string}%{?dist} Summary: A digital video recorder (DVR) application # The primary license is GPLv2+, but bits are borrowed from a number of @@ -1390,6 +1392,10 @@ exit 0 %changelog +* Wed Apr 21 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; - 31.0-17.147.20210421git05c16580e1 +- Update to latest fixes/31. +- Auto compute the version string soley from git describe + * Wed Apr 14 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 31.0-16.139.20210226gitb6ddf202a4 - Rebuild for new x265 diff --git a/sources b/sources index db3a63f..68583a5 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (mythtv-31.0.tar.gz) = d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e +SHA512 (v31.0..05c16580e1.patch) = 072bf1ff9adef0cd0155ace1b8ad338365e79db7f4b67b58e2057f6563e4654b3bba2eb719870553b3a1c673e91004ffac20ea04f69332ce283b027d66860ed5