- updated to 56

[packages/ecryptfs-utils.git] / ecryptfs-utils.spec

diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 7996ceda7a7d3485b25d539d6d0a8514d11469b0..d55263a2c6c1bcafed963b5d4c5becf2782bda4d 100644 (file)
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -1,20 +1,27 @@
 Summary:       The eCryptfs mount helper and support libraries
 Summary(pl.UTF-8):     Narzędzie pomocnicze i biblioteki do montowania eCryptfs
 Name:          ecryptfs-utils
-Version:       23
+Version:       56
 Release:       1
 License:       GPL v2+
 Group:         Base
 Source0:       http://dl.sourceforge.net/ecryptfs/%{name}-%{version}.tar.bz2
-# Source0-md5: 63ed7aa33edf074bb3abdba6271b4370
+# Source0-md5: e199bf29f63ea501c95fc166ed71c093
+Patch0:                %{name}-sh.patch
 URL:           http://ecryptfs.sourceforge.net/
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake
 BuildRequires: gpgme-devel
 BuildRequires: keyutils-devel >= 1.0
-BuildRequires: libgcrypt-devel
-BuildRequires: openssl-devel
+BuildRequires: libgcrypt-devel >= 1.2.0
+BuildRequires: libtool
+BuildRequires: openssl-devel >= 0.9.7
 BuildRequires: pam-devel
 BuildRequires: perl-tools-pod
-Requires:      uname(version) >= 2.6.19
+BuildRequires: pkcs11-helper-devel >= 1.04
+BuildRequires: pkgconfig
+BuildRequires: trousers-devel
+Requires:      uname(release) >= 2.6.19
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,8 +45,8 @@ Summary:      The eCryptfs userspace development package
 Summary(pl.UTF-8):     Pakiet programistyczny przestrzeni użytkownika dla eCryptfs
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      keyutils-devel
-Requires:      libgcrypt-devel
+Requires:      keyutils-devel >= 1.0
+Requires:      libgcrypt-devel >= 1.2.0
 
 %description devel
 Userspace development files for eCryptfs.
@@ -73,11 +80,20 @@ Moduł PAM ecryptfs.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-       --disable-opencryptoki \
-       --disable-rpath
+       --enable-gpg \
+       --enable-openssl \
+       --enable-pam \
+       --enable-pkcs11-helper \
+       --enable-tspi
 
 %{__make}
 
@@ -87,10 +103,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install -D doc/manpage/ecryptfs-manager.8 $RPM_BUILD_ROOT%{_mandir}/man8/ecryptfs-manager.8
-install -D doc/manpage/ecryptfsd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ecryptfsd.8
-install -D doc/manpage/mount.ecryptfs.8 $RPM_BUILD_ROOT%{_mandir}/man8/mount.ecryptfs.8
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -99,14 +111,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README THANKS doc/ecryptfs-faq.html
+%doc AUTHORS NEWS README THANKS doc/{ecryptfs-faq.html,ecryptfs-pkcs11-helper-doc.txt}
 %attr(755,root,root) /sbin/mount.ecryptfs
+%attr(755,root,root) /sbin/mount.ecryptfs_private
+%attr(755,root,root) /sbin/umount.ecryptfs_private
 %attr(755,root,root) %{_bindir}/ecryptfs-*
 %attr(755,root,root) %{_bindir}/ecryptfsd
 %attr(755,root,root) %{_libdir}/libecryptfs.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libecryptfs.so.0
 %dir %{_libdir}/ecryptfs
-%attr(755,root,root) %{_libdir}/ecryptfs/libecryptfs_key_mod_*.so
+%attr(755,root,root) %{_libdir}/ecryptfs/libecryptfs_key_mod_gpg.so
+%attr(755,root,root) %{_libdir}/ecryptfs/libecryptfs_key_mod_openssl.so
+%attr(755,root,root) %{_libdir}/ecryptfs/libecryptfs_key_mod_passphrase.so
+%attr(755,root,root) %{_libdir}/ecryptfs/libecryptfs_key_mod_pkcs11_helper.so
+%attr(755,root,root) %{_libdir}/ecryptfs/libecryptfs_key_mod_tspi.so
+%{_mandir}/man1/ecryptfs-*.1*
+%{_mandir}/man1/mount.ecryptfs_private.1*
+%{_mandir}/man1/umount.ecryptfs_private.1*
 %{_mandir}/man7/ecryptfs.7*
 %{_mandir}/man8/ecryptfs-*.8*
 %{_mandir}/man8/ecryptfsd.8*
@@ -114,17 +135,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/design_doc/ecryptfs_design_doc_v0_2.tex doc/design_doc/*.eps
 %attr(755,root,root) %{_libdir}/libecryptfs.so
-#%{_libdir}/libecryptfs.la
+%{_libdir}/libecryptfs.la
 %{_includedir}/ecryptfs.h
+%{_pkgconfigdir}/libecryptfs.pc
 
-# removed on make install
-#%files static
-#%defattr(644,root,root,755)
-#%{_libdir}/libecryptfs.a
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libecryptfs.a
 
 %files -n pam-pam_ecryptfs
 %defattr(644,root,root,755)
 %doc doc/ecryptfs-pam-doc.txt
 %attr(755,root,root) /%{_lib}/security/pam_ecryptfs.so
+%{_mandir}/man8/pam_ecryptfs.8*