Skip to content

Commit

Permalink
Merge pull request #283 from Olf0/master
Browse files Browse the repository at this point in the history
Beautify & update (align branches)
  • Loading branch information
Olf0 authored Mar 18, 2023
2 parents 54eb55d + b2a3509 commit c2ba4fb
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions rpm/crypto-sdcard.spec
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Requires: sailfish-version >= 2.2.0
Requires: sailfish-version < 3.2.1
Requires: cryptsetup >= 1.4.0
# Necessary counter-dependency to
# https://github.com/Olf0/crypto-sdcard/blob/qcrypto/rpm/crypto-sdcard.spec#L40
# https://github.com/Olf0/crypto-sdcard/blob/qcrypto/rpm/crypto-sdcard.spec#L57
Conflicts: kernel-adaptation-sbj
# ..., see requirement 3 at
# https://github.com/Olf0/crypto-sdcard/blob/master/RPM-dependencies_Git-workflow.md#requirements
Expand All @@ -60,7 +60,8 @@ Conflicts: crypto-sdcard_sbj
%description
%{summary}, as SD-cards, USB-attached storage etc.

"Key"-file naming scheme: /etc/%{name}/crypto_luks_<UUID>.key rsp. /etc/%{name}/crypto_plain_<device-name>.key
"Key"-file naming scheme: /etc/%{name}/crypto_luks_<UUID>.key
respectively for "plain" /etc/%{name}/crypto_plain_<device-name>.key

%if 0%{?_chum}
PackageName: %{name}
Expand Down

0 comments on commit c2ba4fb

Please sign in to comment.