From 46b335fb4575c325c1c63044e53e31817d2d6bd8 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Tue, 31 Aug 2021 02:05:02 +0100 Subject: [PATCH] Rebase to upstream release, 1.21.0.0.0. Resolves: rhbz#1972029 --- jigawatts.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/jigawatts.spec b/jigawatts.spec index bc4219a..dbad5a5 100644 --- a/jigawatts.spec +++ b/jigawatts.spec @@ -1,17 +1,20 @@ %global uname jigawatts + +# For snapshots. Currently unused. %global uversion a5f8e31a4a967059498f820c5728f1deb0736c69 %global dversion %(echo %{uversion} | sed s/-/_/) -%global aarch64 aarch64 arm64 armv8 %global shortcommit %(c=%{uversion}; echo ${c:0:7}) %global commitdate 20210827 +%global aarch64 aarch64 arm64 armv8 + Name: %{uname} -Version: 1.0~SNAPSHOT^%{commitdate}.%{shortcommit} +Version: 1.21.0.0.0 Release: 1%{?dist} Summary: Java CRIU helper License: GPLv2 with exceptions URL: https://github.com/chflood/%{uname} -Source0: https://github.com/chflood/%{uname}/archive/%{uversion}.zip +Source0: https://github.com/chflood/%{uname}/archive/refs/tags/%{version}.tar.gz BuildRequires: java-devel BuildRequires: criu-devel @@ -38,7 +41,7 @@ Summary: Javadoc for %{name} Javadoc for %{name} %prep -%setup -q -n %{uname}-%{uversion} +%setup -q ./autogen.sh @@ -66,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/%{name} %changelog +* Tue Aug 31 2021 Andrew Hughes - 1.21.0.0.0-1 +- Rebase to upstream release, 1.21.0.0.0. +- Resolves: rhbz#1972029 + * Sun Aug 29 2021 Andrew Hughes - 1.0~SNAPSHOT^20210827.a5f8e31-1 - Store the upstream version (currently "1.0-SNAPSHOT") and snapshot info completely in the Version field rather than using Release. - Resolves: rhbz#1972029