Accepting request 827629 from home:dimstar:Factory

- Fix wrong usage of %{_libexecdir} for systemd owned paths below
  %{_prefix}/lib.

OBS-URL: https://build.opensuse.org/request/show/827629
OBS-URL: https://build.opensuse.org/package/show/security/ecryptfs-utils?expand=0&rev=82
This commit is contained in:
Marcus Meissner 2020-08-20 15:50:11 +00:00 committed by Git OBS Bridge
parent feeda023e6
commit bdb808b96e
2 changed files with 14 additions and 8 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 18 15:21:46 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix wrong usage of %{_libexecdir} for systemd owned paths below
%{_prefix}/lib.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 21 09:53:30 UTC 2018 - meissner@suse.com Wed Feb 21 09:53:30 UTC 2018 - meissner@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package ecryptfs-utils # spec file for package ecryptfs-utils
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -21,9 +21,9 @@ Name: ecryptfs-utils
Version: 111 Version: 111
Release: 0 Release: 0
Summary: Userspace Utilities for ecryptfs Summary: Userspace Utilities for ecryptfs
License: GPL-2.0 License: GPL-2.0-only
Group: Productivity/Security Group: Productivity/Security
Url: http://ecryptfs.org/ URL: http://ecryptfs.org/
Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils_%{version}.orig.tar.gz Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils_%{version}.orig.tar.gz
Source1: baselibs.conf Source1: baselibs.conf
Source2: ecryptfs-mount-private.png Source2: ecryptfs-mount-private.png
@ -114,8 +114,8 @@ mv %{buildroot}/%{_datadir}/%{name}/ecryptfs-setup-private.desktop %{buildroot}/
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
#we need ecryptfs kernel module #we need ecryptfs kernel module
mkdir -p %{buildroot}%{_libexecdir}/modules-load.d/ mkdir -p %{buildroot}%{_prefix}/lib/modules-load.d/
echo -e "# ecryptfs module is needed before ecryptfs mount, so mount helper can \n# check for file name encryption support\necryptfs" >%{buildroot}%{_libexecdir}/modules-load.d/ecryptfs.conf echo -e "# ecryptfs module is needed before ecryptfs mount, so mount helper can \n# check for file name encryption support\necryptfs" >%{buildroot}%{_prefix}/lib/modules-load.d/ecryptfs.conf
%verifyscript %verifyscript
%verify_permissions -e /sbin/mount.ecryptfs_private %verify_permissions -e /sbin/mount.ecryptfs_private
@ -153,8 +153,8 @@ fi
#{python_sitelib}/ecryptfs-utils #{python_sitelib}/ecryptfs-utils
#{python_sitearch}/ecryptfs-utils #{python_sitearch}/ecryptfs-utils
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%dir %{_libexecdir}/modules-load.d %dir %{_prefix}/lib/modules-load.d
%{_libexecdir}/modules-load.d/* %{_prefix}/lib/modules-load.d/*
%files -n %{lname} %files -n %{lname}
%defattr(-, root, root) %defattr(-, root, root)