Hello community, here is the log from the commit of package ecryptfs-utils for openSUSE:Factory checked in at 2014-08-20 10:51:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ecryptfs-utils (Old) and /work/SRC/openSUSE:Factory/.ecryptfs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ecryptfs-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/ecryptfs-utils/ecryptfs-utils.changes 2013-08-18 22:29:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ecryptfs-utils.new/ecryptfs-utils.changes 2014-08-20 10:51:46.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Aug 8 10:56:20 UTC 2014 - [email protected] + +- Drop ecryptfs-correct-desktop.patch and ensure + ecryptfs-mount-private.desktop is properly generated and + installed in a program specific location (ecryptfs-setup-private + will take care of creating the right symlink) and not in + /usr/share/applications by default. +- Add ecryptfs-mount-private.png (from Fedora) +- Create tmpfiles.d to ensure ecryptfs module is autoloaded at + start. +- Fix category on ecryptfs-setup-private.desktop. + +------------------------------------------------------------------- Old: ---- ecryptfs-correct-desktop.patch New: ---- ecryptfs-mount-private.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ecryptfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.rONMLQ/_old 2014-08-20 10:51:48.000000000 +0200 +++ /var/tmp/diff_new_pack.rONMLQ/_new 2014-08-20 10:51:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ecryptfs-utils # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,11 +25,11 @@ Release: 0 Source0: http://launchpad.net/ecryptfs/trunk/%version/+download/ecryptfs-utils_%version.orig.tar.gz Source1: baselibs.conf +Source2: ecryptfs-mount-private.png # PATCH-FIX-OPENSUSE fix for systemd and no UUID in fstab Patch0: ecryptfs-setup-swap-SuSE.patch # PATCH-FIX-OPENSUSE build with -fpie/-pie Patch1: ecryptfs-utils-src-utils-Makefile.patch -Patch2: ecryptfs-correct-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gtk2-devel BuildRequires: intltool @@ -56,7 +56,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -74,12 +73,23 @@ %install %makeinstall -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ -mv $RPM_BUILD_ROOT/%{_datadir}/ecryptfs-utils/*desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ -%suse_update_desktop_file ecryptfs-mount-private -%suse_update_desktop_file ecryptfs-setup-private +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.png +printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +printf "Encoding=UTF-8\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +printf "Icon=%{_datadir}/%{name}/ecryptfs-mount-private.png\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +printf "Icon=%{_datadir}/%{name}/ecryptfs-mount-private.png\n" >>$RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +sed -i 's|^_||' $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +sed -i 's|^_||' $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-setup-private.desktop $RPM_BUILD_ROOT/%{_datadir}/applications +%suse_update_desktop_file $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +%suse_update_desktop_file -r ecryptfs-setup-private System Security %find_lang %{name} +#we need ecryptfs kernel module +mkdir -p $RPM_BUILD_ROOT/usr/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" >$RPM_BUILD_ROOT/usr/lib/modules-load.d/ecryptfs.conf + %verifyscript %verify_permissions -e /sbin/mount.ecryptfs_private @@ -113,6 +123,8 @@ /%_lib/security/pam_ecryptfs.so %{python_sitelib}/ecryptfs-utils %{python_sitearch}/ecryptfs-utils -%{_datadir}/applications/ecryptfs-* +%{_datadir}/applications/*.desktop +%dir /usr/lib/modules-load.d +/usr/lib/modules-load.d/* %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
