From 882cae396be02320a93a38ffabbda0bc125a66e5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Nov 26 2021 00:39:50 +0000 Subject: update to the latest git --- diff --git a/.gitignore b/.gitignore index 2a4290a..8c18541 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /ugene-free-20211117T0834.tar.gz /ugene-free-20211118T0755.tar.gz /ugene-free-20211119T0709.tar.gz +/ugene-free-20211126T0914.tar.gz diff --git a/sources b/sources index 843230d..b032795 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ugene-free-20211119T0709.tar.gz) = 20c7d7bbd3e640a00a526d8bb19c8f6df8cc319504dd34bf745d64af25ae34020fe9c2a44f164001dd6afecd9aab2a695e95580625f9a939009b92cab5e3c5c1 +SHA512 (ugene-free-20211126T0914.tar.gz) = 605c581c5862da91f2705c3d036d56b98ddfbc71877b9b8939f76c1c3b22cafd74c6d5052bcb4650299e0c4d8a352a3505281aa0ebdedc5d99993641d10ba121 diff --git a/ugene.spec b/ugene.spec index a40435c..ce34b5b 100644 --- a/ugene.spec +++ b/ugene.spec @@ -1,12 +1,25 @@ +%global use_release_branch 0 + +%if 0%{?use_release_branch} < 1 +# master +%global gitdate 20211125 +%global gitcommit 18d20612d4d2b6deb0085200ee91fd1c981aa983 +# New git commit with non-free part using "git filter-branch" +%global gitcommit_free c6cad806c4ce6b7531f4455c06e6bbf91ef509e0 +%else +# currently 41.0 branch %global gitdate 20211117 %global gitcommit 2d776cc668bc5019452e25ecc330c88093e75c48 # New git commit with non-free part using "git filter-branch" %global gitcommit_free 02c04596cd6543ab44cc212ac1b383f825998b0e +%endif + + %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) %global git_version D%{gitdate}git%{shortcommit} -%global tarballdate 20211119 -%global tarballtime 0709 +%global tarballdate 20211126 +%global tarballtime 0914 %global use_release 0 %global use_gitbare 1