commit 35ba455cc1fdd4619eb183d55979fd7eab987010 Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; Date: Sat Jul 4 08:29:42 2020 -0400 New upstream release, migrate to new package versioning .gitignore | 1 + cinelerra-gg.spec | 20 +++++++++----------- sources | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) --- diff --git a/.gitignore b/.gitignore index 8160ebb..b3b48cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cinelerra-gg-d5a0afb.tar.gz /cinelerra-gg-b8cd5c4.tar.gz /cinelerra-gg-3878a69.tar.bz2 +/cinelerra-gg-2020-06.tar.gz diff --git a/cinelerra-gg.spec b/cinelerra-gg.spec index ddec9ff..db5a524 100644 --- a/cinelerra-gg.spec +++ b/cinelerra-gg.spec @@ -1,10 +1,9 @@ -%global commit0 3878a693e0ea8626268a95333a11954cf9c10930 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global snapshotdate 20191231 +%global git_tag 2020-06 +%global tag_version %(c=%{git_tag}; echo "${c}" | tr '-' '.') Name: cinelerra-gg -Version: 5.1 -Release: 59.%{snapshotdate}git%{shortcommit0}%{?dist} +Version: 5.1%{?tag_version:.%{tag_version}} +Release: 1%{?dist} Summary: A non linear video editor and effects processor # The Cinelerra-GG codebase is licensed GPLv2+ # The GREYcstoration plugin is licensed CeCILL v2.0 @@ -13,7 +12,7 @@ Summary: A non linear video editor and effects processor # The freeverb components and the Tapeworm font are in the public Domain License: GPLv2+ and CeCILL and BSD and CC-BY and Public Domain Url: https://cinelerra-gg.org/ -Source0: https://git.cinelerra-gg.org/git/?p=goodguy/cinelerra.git;a=snapshot;h=%{... +Source0: https://git.cinelerra-gg.org/git/?p=goodguy/cinelerra.git;a=snapshot;sf=t... # CrystalHD is fouling the ffmpeg build Patch0: cinelerra-gg-Disable-crystalhd-in-ffmpeg.patch @@ -114,7 +113,7 @@ BuildArch: noarch %prep -%setup -q -n cinelerra-%{shortcommit0}/cinelerra-%{version} +%setup -q -n cinelerra-%{git_tag}/cinelerra-5.1 %patch0 -p2 -b.crystal @@ -193,12 +192,8 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %license plugins/theme_neophyte/Neophyte_License.txt %doc README %{_bindir}/%{name} -%{_bindir}/cin_db -%{_bindir}/zmpeg3cat %{_bindir}/zmpeg3cc2txt %{_bindir}/zmpeg3ifochk -%{_bindir}/zmpeg3show -%{_bindir}/zmpeg3toc %{_bindir}/bdwrite %{_datadir}/%{name}/ %exclude %{_datadir}/%{name}/doc @@ -213,6 +208,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop %changelog +* Sat Jul 04 2020 FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; - 5.1.2020.06-1 +- New upstream release, migrate to new package versioning + * Sun May 24 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 5.1-59.20191231git3878a69 - Rebuild for dav1d SONAME bump diff --git a/sources b/sources index 3a92e80..aeb0f90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cinelerra-gg-3878a69.tar.bz2) = 48cdf8493d8321fce0a246644178aba09668b987c81975f36394144ff1ac6a40495d2c57e0830c712287ecbca75fedd563e3fa17d8213a42420e5b3c475b2b6e +SHA512 (cinelerra-gg-2020-06.tar.gz) = aef67c56e692f7c0953337c89527bf9eb1648f1d8ff4d0ac25a390590578c173c6a7a2f45b1f4218033095b9b624d313066c426a9545420921cfe30c051e2a53