diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 56f720a..938f0b7 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -1,7 +1,5 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%global _libdir /%{_lib} -%global _sbindir /sbin Name: ecryptfs-utils Version: 93 @@ -66,6 +64,7 @@ Patch19: ecryptfs-utils-87-syslog.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: keyutils, cryptsetup-luks, util-linux-ng, gettext +Conflicts: filesystem < 3 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel BuildRequires: trousers-devel nss-devel desktop-file-utils intltool BuildRequires: pkcs11-helper-devel @@ -84,6 +83,7 @@ Summary: The eCryptfs userspace development package Group: System Environment/Base Requires: keyutils-libs-devel %{name} = %{version}-%{release} Requires: pkgconfig +Conflicts: filesystem < 3 %description devel Userspace development files for eCryptfs. @@ -123,7 +123,7 @@ the interface supplied by the ecryptfs-utils library. export CFLAGS="$RPM_OPT_FLAGS -Werror -Wtype-limits" #we're modifing Makefile.am autoreconf -fiv -%configure --disable-rpath --enable-tspi --enable-nss --enable-pkcs11-helper +%configure --disable-rpath --enable-tspi --enable-nss --enable-pkcs11-helper --with-pamdir=%{_libdir}/security make clean #disable rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -154,6 +154,8 @@ touch -r src/desktop/ecryptfs-setup-private.desktop \ $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-record-passphrase +mv $RPM_BUILD_ROOT/sbin $RPM_BUILD_ROOT/%{_sbindir} + %find_lang %{name} %check