From e380e79e96c8c0a29e8f3ec8edfaaecf3da0e466ec61e33a0beba15219f935e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 8 Oct 2013 15:11:32 +0000 Subject: [PATCH] Revert commit Set the defattr dir mode of the main package as not specified to avoid a conflict with the keyutils package. cause %defattr(-,root,root,-) is what you get from %defattr(-,root,root). We discussed this recently on the opensuse-factory list as part of this thread http://lists.opensuse.org/opensuse-factory/2013-09/msg00168.html OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=93 --- cifs-utils.changes | 6 ------ cifs-utils.spec | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/cifs-utils.changes b/cifs-utils.changes index 9d7cf5d..c4a73ab 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri May 31 15:33:58 UTC 2013 - varkoly@suse.com - -- Set the defattr dir mode of the main package as not specified to avoid a - conflict with the keyutils package. - ------------------------------------------------------------------- Thu Mar 21 10:46:51 UTC 2013 - mmeister@suse.com diff --git a/cifs-utils.spec b/cifs-utils.spec index a138de1..693729c 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -159,7 +159,7 @@ exit 0 exit 0 %files -%defattr(-,root,root,-) +%defattr(-,root,root) /sbin/mount.cifs %if 0%{?centos_version} > 599 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1020 %{_bindir}/getcifsacl