From 69b35a9a8295e56b6e5d4ed45060ad48dd65003e Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 11 Aug 2020 13:10:35 -0400 Subject: veracrypt 1.24-u7 rpm rc1 --- veracrypt/vc_fedora.patch | 2 +- veracrypt/veracrypt.spec | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/veracrypt/vc_fedora.patch b/veracrypt/vc_fedora.patch index 3bd18ed..a2b7024 100644 --- a/veracrypt/vc_fedora.patch +++ b/veracrypt/vc_fedora.patch @@ -3,7 +3,7 @@ diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Common/Dlgcode.c VeraCrypt_ +++ VeraCrypt_1.22-1/src/Common/Dlgcode.c 2018-09-02 08:22:00.007030589 -0400 @@ -1280,7 +1280,7 @@ L"This software as a whole:\r\n" - L"Copyright \xA9 2013-2019 IDRIX. All rights reserved.\r\n\r\n" + L"Copyright \xA9 2013-2020 IDRIX. All rights reserved.\r\n\r\n" - L"An IDRIX Release"); + L"A Fedora copr release"); diff --git a/veracrypt/veracrypt.spec b/veracrypt/veracrypt.spec index 0e30987..2948353 100644 --- a/veracrypt/veracrypt.spec +++ b/veracrypt/veracrypt.spec @@ -1,6 +1,6 @@ %global pname VeraCrypt %global dummy_package 0 -%global tarballdir %{pname}_%{version} +%global tarballdir %{pname}_%{upstream_version} %global srcdir %{tarballdir}/src %global indocdir %{tarballdir}/doc %define license_files %{srcdir}/License.txt @@ -74,17 +74,19 @@ %endif %endif +%define upstream_version 1.24-Update7 + Name: veracrypt -Version: 1.24 +Version: %( echo %{upstream_version} | tr '-' '_' ) Release: 1 Summary: Disk encryption with strong security based on TrueCrypt Group: Applications/File License: Apache License 2.0 and TrueCrypt License 3.0 URL: https://www.veracrypt.fr/ -Source0: https://www.veracrypt.fr/code/%{pname}/snapshot/%{pname}_%{version}.tar.gz -#Source0: https://gitlab.com/bgstack15/big-sources/raw/master/%%{name}/%%{pname}_%%{version}.tar.gz -#Source0: https://launchpad.net/veracrypt/trunk/%%{version}/+download/VeraCrypt_%%{version}_Source.tar.bz2 +Source0: https://www.veracrypt.fr/code/%{pname}/snapshot/%{pname}_%{upstream_version}.tar.gz +#Source0: https://gitlab.com/bgstack15/big-sources/raw/master/%%{name}/%%{pname}_%%{upstream_version}.tar.gz +#Source0: https://launchpad.net/veracrypt/trunk/%%{upstream_version}/+download/VeraCrypt_%%{upstream_version}_Source.tar.bz2 Patch0: vc_fedora.patch Patch1: vc_desktop.patch @@ -112,7 +114,7 @@ VeraCrypt is a free open source disk encryption software for Windows, Mac OSX an %setup -q -c # change to that directory so the patch files do not need versioned directories to be updated -pushd %{pname}_%{version} +pushd %{tarballdir} %patch0 -p1 %patch1 -p1 popd @@ -232,6 +234,10 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Aug 11 2020 B Stack 1.24_Update7-1 +- version bump +- handle new version naming with dashes + * Tue Oct 08 2019 B Stack 1.24-1 - version bump -- cgit