From 6a9632a0b7ab6cca06806d6036559522a27f5c4a2d33ed0e7d0b95f07649f36f Mon Sep 17 00:00:00 2001 From: Factory Maintainer Date: Sat, 3 Nov 2012 07:17:34 +0000 Subject: [PATCH] osc copypac from project:home:fcrozat:branches:security package:cryptsetup revision:2 OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=94 --- cryptsetup.changes | 5 +++++ cryptsetup.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cryptsetup.changes b/cryptsetup.changes index 06ec59b..cab100f 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 25 11:40:07 UTC 2012 - fcrozat@suse.com + +- Remove crypttab manpage, it is now provided by systemd. + ------------------------------------------------------------------- Wed Aug 1 13:37:04 UTC 2012 - lnussel@suse.de diff --git a/cryptsetup.spec b/cryptsetup.spec index 6a2da85..902cbe5 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -160,6 +160,9 @@ ln -s /etc/init.d/boot.crypto $RPM_BUILD_ROOT/sbin/rccrypto # %find_lang %name --all-name +# systemd is now providing cryptsetup manpage +rm -f $RPM_BUILD_ROOT%_mandir/man5/crypttab.5* + %pre # hack to catch update case from aaa_base/util-linux-crypto if [ -f /etc/init.d/boot.d/S??boot.crypto ]; then @@ -222,7 +225,6 @@ fi %_mandir/man8/cryptsetup.8.gz %_mandir/man8/cryptsetup-reencrypt.8.gz %_mandir/man8/veritysetup.8.gz -%_mandir/man5/crypttab.5.gz %_mandir/man5/cryptotab.5.gz /lib/cryptsetup