summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2018-09-26 22:29:31 +0000
committerB Stack <bgstack15@gmail.com>2018-09-26 22:29:31 +0000
commita0e16aa64f2d9364162c3cd6ffb06d7722752ac3 (patch)
tree71d39997d05cecc76f0c59a065dee1a86cfcecfa
parentbump palemoon to 28.1.0 (diff)
parentveracrypt 1.23 (diff)
downloadstackrpms-a0e16aa64f2d9364162c3cd6ffb06d7722752ac3.tar.gz
stackrpms-a0e16aa64f2d9364162c3cd6ffb06d7722752ac3.tar.bz2
stackrpms-a0e16aa64f2d9364162c3cd6ffb06d7722752ac3.zip
Merge branch 'veracrypt-bump' into 'master'
veracrypt 1.23 Upstream provided the include <sys/macros.h>, so removed the local patch. See merge request bgstack15/stackrpms!10
-rw-r--r--veracrypt/vc_include_sysmacros.patch11
-rw-r--r--veracrypt/veracrypt.spec15
2 files changed, 8 insertions, 18 deletions
diff --git a/veracrypt/vc_include_sysmacros.patch b/veracrypt/vc_include_sysmacros.patch
deleted file mode 100644
index 9381b40..0000000
--- a/veracrypt/vc_include_sysmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -x '*.orig' -x '*.rej' -Naur VeraCrypt_1.22/src/Platform/Unix/FilesystemPath.cpp VeraCrypt_1.22-1/src/Platform/Unix/FilesystemPath.cpp
---- VeraCrypt_1.22/src/Platform/Unix/FilesystemPath.cpp 2018-03-30 07:54:10.000000000 -0400
-+++ VeraCrypt_1.22-1/src/Platform/Unix/FilesystemPath.cpp 2018-09-05 21:20:12.897225387 -0400
-@@ -15,6 +15,7 @@
- #include "Platform/StringConverter.h"
- #include <stdio.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
-
- namespace VeraCrypt
- {
diff --git a/veracrypt/veracrypt.spec b/veracrypt/veracrypt.spec
index 43ea177..c8c2614 100644
--- a/veracrypt/veracrypt.spec
+++ b/veracrypt/veracrypt.spec
@@ -73,8 +73,8 @@
%endif
Name: veracrypt
-Version: 1.22
-Release: 4
+Version: 1.23
+Release: 1
Summary: Disk encryption with strong security based on TrueCrypt
Group: Applications/File
@@ -85,7 +85,6 @@ Source0: https://www.veracrypt.fr/code/%{pname}/snapshot/%{pname}_%{version}.tar
#Source0: https://launchpad.net/veracrypt/trunk/%%{version}/+download/VeraCrypt_%%{version}_Source.tar.bz2
Patch0: vc_fedora.patch
Patch1: vc_desktop.patch
-Patch2: vc_include_sysmacros.patch
Packager: Bgstack15 <bgstack15@gmail.com>
%if "%{?wx_toolkit}" != ""
@@ -110,9 +109,11 @@ VeraCrypt is a free open source disk encryption software for Windows, Mac OSX an
%prep
%setup -q -c
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
+# change to that directory so the patch files do not need versioned directories to be updated
+pushd %{pname}_%{version}
+%patch0 -p1
+%patch1 -p1
+popd
%build
%if 0%{wx_version_major} < 3
@@ -229,5 +230,5 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
-* Thu Sep 06 2018 B Stack <bgstack15@gmail.com> 1.22-4
+* Wed Sep 26 2018 B Stack <bgstack15@gmail.com> 1.23-1
- rebuild rpm
bgstack15