- release 2 (by relup.sh)

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

diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 46afe094f197bbabba46f6a49d9d39cbb3e33462..bd41392c1a0e0c6adbc76c4319a6856b061fad2b 100644 (file)
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -1,22 +1,28 @@
+#
+# Conditional build:
+%bcond_with    gui     # GTK+ GUI components (non-existing as of 104)
+#
 Summary:       The eCryptfs mount helper and support libraries
 Summary(pl.UTF-8):     Narzędzie pomocnicze i biblioteki do montowania eCryptfs
 Name:          ecryptfs-utils
-Version:       85
-Release:       3
+Version:       106
+Release:       2
 License:       GPL v2+
 Group:         Base
-Source0:       http://launchpad.net/ecryptfs/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz
-# Source0-md5: eacf9488681d99651da544a4c261f784
+#Source0Download: https://launchpad.net/ecryptfs/+download
+Source0:       https://launchpad.net/ecryptfs/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz
+# Source0-md5: bff8052636f6be642f15c6be45a14ea3
 Patch0:                %{name}-sh.patch
 Patch1:                %{name}-83-fixsalt.patch
 Patch2:                %{name}-83-splitnss.patch
-Patch3:                %{name}-84-fgetc.patch
-Patch4:                %{name}-84-fixsigness.patch
-Patch5:                %{name}-75-werror.patch
-URL:           http://ecryptfs.sourceforge.net/
+Patch3:                %{name}-84-fixsigness.patch
+URL:           http://ecryptfs.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
+BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 2.0
 BuildRequires: gpgme-devel
+%{?with_gui:BuildRequires:     gtk+2-devel >= 2.0}
 BuildRequires: intltool >= 0.41.0
 BuildRequires: keyutils-devel >= 1.0
 BuildRequires: libtool
@@ -27,8 +33,11 @@ BuildRequires:       perl-tools-pod
 BuildRequires: pkcs11-helper-devel >= 1.04
 BuildRequires: pkgconfig
 BuildRequires: python-devel >= 1:2.5
+BuildRequires: python-modules >= 1:2.5
+BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
 BuildRequires: swig >= 1.3.31
+BuildRequires: swig-python >= 1.3.31
 BuildRequires: trousers-devel
 Requires:      uname(release) >= 2.6.19
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -113,8 +122,6 @@ ecryptfs-utils.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -124,6 +131,8 @@ ecryptfs-utils.
 %{__automake}
 %configure \
        --enable-gpg \
+       %{?with_gui:--enable-gui} \
+       --enable-nss \
        --enable-openssl \
        --enable-pam \
        --enable-pkcs11-helper \
@@ -150,24 +159,24 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 260 ecryptfs
 
 %postun
+/sbin/ldconfig
 if [ "$1" = "0" ]; then
         %groupremove ecryptfs
 fi
 
 %post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog 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(4754,root,ecryptfs) /sbin/mount.ecryptfs_private
 %attr(755,root,root) /sbin/umount.ecryptfs_private
 %attr(755,root,root) /sbin/umount.ecryptfs
 %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
+%attr(755,root,root) %ghost %{_libdir}/libecryptfs.so.1
 %dir %{_libdir}/ecryptfs
 %attr(755,root,root) %{_libdir}/ecryptfs/libecryptfs_key_mod_gpg.so
 %attr(755,root,root) %{_libdir}/ecryptfs/libecryptfs_key_mod_openssl.so
@@ -197,7 +206,6 @@ fi
 
 %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*