Hello community, here is the log from the commit of package ecryptfs-utils for openSUSE:Factory checked in at 2015-10-08 08:26:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-05-15 07:43:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ecryptfs-utils.new/ecryptfs-utils.changes 2015-10-08 08:26:22.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Oct 2 19:55:18 UTC 2015 - [email protected] + +- Do not ship .la files + +------------------------------------------------------------------- +Wed Sep 30 14:30:56 UTC 2015 - [email protected] + +- Cleanup spec file with spec-cleaner +- Update autotool dependencies +- Split library and devel packages +- Use desktop file macros +- Use fdupes to reduce duplicities + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ecryptfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.qfZ14e/_old 2015-10-08 08:26:23.000000000 +0200 +++ /var/tmp/diff_new_pack.qfZ14e/_new 2015-10-08 08:26:23.000000000 +0200 @@ -16,21 +16,24 @@ # +%define lname libecryptfs1 Name: ecryptfs-utils -Url: http://ecryptfs.org/ +Version: 106 +Release: 0 Summary: Userspace Utilities for ecryptfs License: GPL-2.0+ Group: Productivity/Security -Version: 106 -Release: 0 -Source0: http://launchpad.net/ecryptfs/trunk/%version/+download/ecryptfs-utils_%version.orig.tar.gz +Url: http://ecryptfs.org/ +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 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: fdupes BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: keyutils-devel @@ -42,89 +45,121 @@ BuildRequires: pam-config BuildRequires: pam-devel BuildRequires: pkcs11-helper-devel +BuildRequires: pkg-config BuildRequires: python-devel BuildRequires: swig BuildRequires: trousers-devel BuildRequires: update-desktop-files Requires(pre): pam-config -PreReq: permissions +Requires(pre): permissions +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A stacked cryptographic filesystem for Linux. +%package -n %{lname} +Summary: Shared library for %{name} +Group: System/Libraries + +%description -n %{lname} +A stacked cryptographic filesystem for Linux. + +%package devel +Summary: Development files for %{name} +Group: Development/Languages/C and C++ +Requires: %{lname} = %{version} + +%description devel +A stacked cryptographic filesystem for Linux. + %prep %setup -q %patch0 -p1 %patch1 -p1 %build -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -autoreconf -i -f +export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" +autoreconf -fiv %configure \ - --docdir=%_defaultdocdir/%{name} \ + --docdir=%{_defaultdocdir}/%{name} \ --disable-static \ --enable-tspi \ --enable-pkcs11-helper \ - --with-pamdir=/%_lib/security + --with-pamdir=/%{_lib}/security make %{?_smp_mflags} %check -make check +make %{?_smp_mflags} check %install -%makeinstall -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 +make DESTDIR=%{buildroot} install %{?_smp_mflags} +mkdir -p %{buildroot}/%{_datadir}/applications +install -m644 %{SOURCE2} %{buildroot}%{_datadir}/%{name}/ecryptfs-mount-private.png +printf "Encoding=UTF-8\n" >>%{buildroot}/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +printf "Encoding=UTF-8\n" >>%{buildroot}/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +printf "Icon=%{_datadir}/%{name}/ecryptfs-mount-private.png\n" >>%{buildroot}/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +printf "Icon=%{_datadir}/%{name}/ecryptfs-mount-private.png\n" >>%{buildroot}/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +sed -i 's|^_||' %{buildroot}/%{_datadir}/%{name}/ecryptfs-mount-private.desktop +sed -i 's|^_||' %{buildroot}/%{_datadir}/%{name}/ecryptfs-setup-private.desktop +mv %{buildroot}/%{_datadir}/%{name}/ecryptfs-setup-private.desktop %{buildroot}/%{_datadir}/applications +%suse_update_desktop_file %{buildroot}/%{_datadir}/%{name}/ecryptfs-mount-private.desktop %suse_update_desktop_file -r ecryptfs-setup-private System Security %find_lang %{name} +# replace duplicate files by symlinks +%fdupes -s %{buildroot} +# do not ship .la files +find %{buildroot} -type f -name "*.la" -delete -print #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 +mkdir -p %{buildroot}%{_libexecdir}/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 %verifyscript %verify_permissions -e /sbin/mount.ecryptfs_private %post -/sbin/ldconfig %set_permissions /sbin/mount.ecryptfs_private -/usr/sbin/pam-config -a --ecryptfs +%{_sbindir}/pam-config -a --ecryptfs +%desktop_database_post + +%post -n %{lname} -p /sbin/ldconfig %postun -/sbin/ldconfig if [ "$1" -eq 0 ]; then - /usr/sbin/pam-config -d --ecryptfs + %{_sbindir}/pam-config -d --ecryptfs fi +%desktop_database_postun + +%postun -n %{lname} -p /sbin/ldconfig %files -f %{name}.lang %defattr(-, root, root) %doc COPYING NEWS README THANKS doc/ecryptfs-faq.html -/usr/include/ecryptfs.h -%{_prefix}/bin/* +%{_bindir}/* /sbin/mount.ecryptfs /sbin/umount.ecryptfs /sbin/umount.ecryptfs_private %verify(not mode) /sbin/mount.ecryptfs_private -%{_libdir}/libecryptfs* -%{_libdir}/pkgconfig/libecryptfs.pc %{_mandir}/man1/*ecryptfs* %{_mandir}/man7/ecryptfs* %{_mandir}/man8/*ecryptfs* %{_libdir}/ecryptfs* %{_datadir}/ecryptfs-utils -/%_lib/security/pam_ecryptfs.so +/%{_lib}/security/pam_ecryptfs.so %{python_sitelib}/ecryptfs-utils %{python_sitearch}/ecryptfs-utils %{_datadir}/applications/*.desktop -%dir /usr/lib/modules-load.d -/usr/lib/modules-load.d/* +%dir %{_libexecdir}/modules-load.d +%{_libexecdir}/modules-load.d/* + +%files -n %{lname} +%defattr(-, root, root) +%{_libdir}/libecryptfs.so.* + +%files devel +%defattr(-, root, root) +%{_includedir}/ecryptfs.h +%{_libdir}/libecryptfs.so +%{_libdir}/pkgconfig/libecryptfs.pc %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.qfZ14e/_old 2015-10-08 08:26:23.000000000 +0200 +++ /var/tmp/diff_new_pack.qfZ14e/_new 2015-10-08 08:26:23.000000000 +0200 @@ -1,2 +1,5 @@ ecryptfs-utils supplements "packageand(ecryptfs-utils:pam-<targettype>)" +libecryptfs1 +ecryptfs-utils-devel + requires "libecryptfs1-<targettype> = <version>"
