From 873dd6b5e4162a4bb6001f10e9446dec82da2894 Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 6 Sep 2018 07:05:40 -0400 Subject: attempt 2 for licensing file --- veracrypt/veracrypt.spec | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/veracrypt/veracrypt.spec b/veracrypt/veracrypt.spec index a417aae..aed875c 100644 --- a/veracrypt/veracrypt.spec +++ b/veracrypt/veracrypt.spec @@ -104,8 +104,6 @@ BuildRequires: ghostscript-core %else BuildRequires: ghostscript %endif -# WORKHERE: experiment with not requiring this, explicitly -#Requires: wxGTK3 %description VeraCrypt is a free open source disk encryption software for Windows, Mac OSX and Linux. Brought to you by IDRIX (https://www.idrix.fr) and based on TrueCrypt 7.1a. @@ -132,16 +130,22 @@ if hash "${WXCONFIG}-%{?wx_toolkit}" >/dev/null 2>&1 ; then fi %endif -pushd %{srcdir} -%{__make} WX_CONFIG="${WXCONFIG}" %{?_smp_mflags} -popd +%if !0%{?dummy_package} + pushd %{srcdir} + %{__make} WX_CONFIG="${WXCONFIG}" %{?_smp_mflags} + popd +%endif %install #%make_install -C %{tarballdir}/src %{__install} -d "%{buildroot}%{_bindir}" +%if !0%{?dummy_package} %{__install} %{srcdir}/Main/veracrypt "%{buildroot}%{_bindir}" +%endif %{__install} -d "%{buildroot}%{_docdir}/%{name}" +%if !0%{?doc_license} %{__install} -m 0644 %{srcdir}/License.txt "%{buildroot}%{_docdir}/%{name}" +%endif %{__install} -d "%{buildroot}%{_datadir}/applications" "%{buildroot}%{_datadir}/pixmaps" %{__install} %{srcdir}/Setup/Linux/%{name}.desktop "%{buildroot}%{_datadir}/applications" %{__install} %{srcdir}/Resources/Icons/VeraCrypt-256x256.xpm "%{buildroot}%{_datadir}/pixmaps/veracrypt.xpm" @@ -162,8 +166,11 @@ test -f %{srcdir}/Setup/Linux/%{name}.desktop && \ #do # %{__install} -p -D -d %{indocdir}/${thisdir} %{buildroot}%{_defaultdocdir}/%{name}/${thisdir} #done -# rename doc with spaces in name, mostly for user guide -find %{indocdir} -name '* *' ! -regex '.*doc.html.*' -exec rename -v ' ' '_' {} + || : +if test -e "%{indocdir}/chm/VeraCrypt User Guide.chm" ; +then + mv "%{indocdir}/chm/VeraCrypt User Guide.chm" "%{indocdir}/chm/VeraCrypt_User_Guide.chm" || : +fi +%{__install} -m 0644 -t %{buildroot}%{_docdir}/%{name} %{indocdir}/chm/VeraCrypt_User_Guide.chm # icons pushd %{srcdir}/Resources/Icons @@ -218,7 +225,9 @@ fi %doc %{license_files} %endif %doc "%{indocdir}/chm/VeraCrypt_User_Guide.chm" %{indocdir}/EFI-DCS/ %{indocdir}/html/ +%if !0%{?dummy_package} %{_bindir}/%{name} +%endif #%{_docdir}/%{name} # handled by %doc above? %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/* -- cgit