rpms/ecryptfs-utils/F-12 ecryptfs-utils.spec,1.62,1.63

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/pkgs/rpms/ecryptfs-utils/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7650

Modified Files:
	ecryptfs-utils.spec 
Log Message:
* Tue May 04 2010 Michal Hlavinka <mhlavink at redhat.com> - 83-5
- remove nss dependency from umount.ecryptfs



Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecryptfs-utils/F-12/ecryptfs-utils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- ecryptfs-utils.spec	16 Apr 2010 12:09:49 -0000	1.62
+++ ecryptfs-utils.spec	4 May 2010 11:40:29 -0000	1.63
@@ -5,7 +5,7 @@
 
 Name: ecryptfs-utils
 Version: 83
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -23,11 +23,15 @@ Patch2: ecryptfs-utils-75-nocryptdisks.p
 # rhbz#553629, fix usage of salt together with file_passwd
 Patch3: ecryptfs-utils-83-fixsalt.patch
 
+# fedora/rhel specific, rhbz#486139, remove nss dependency from umount.ecryptfs
+Patch4: ecryptfs-utils-83-splitnss.patch
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils, cryptsetup-luks, util-linux-ng
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
 BuildRequires: trousers-devel nss-devel desktop-file-utils intltool
 BuildRequires: pkcs11-helper-devel
+BuildRequires: automake autoconf libtool glib2-devel gettext-devel
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -62,9 +66,12 @@ the interface supplied by the ecryptfs-u
 %patch1 -p1 -b .werror
 %patch2 -p1 -b .nocryptdisks
 %patch3 -p1 -b .fixsalt
+%patch4 -p1 -b .splitnss
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
+#we're modifing Makefile.am
+autoreconf -fiv
 %configure --disable-rpath --enable-tspi --enable-nss --enable-pkcs11-helper
 make clean
 #disable rpath
@@ -98,6 +105,12 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name
 
 %find_lang %{name}
 
+%check
+if ldd $RPM_BUILD_ROOT%{_sbindir}/umount.ecryptfs | grep -q '/usr/'
+then
+  exit 1
+fi
+
 %pre
 groupadd -r -f ecryptfs
 
@@ -179,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue May 04 2010 Michal Hlavinka <mhlavink at redhat.com> - 83-5
+- remove nss dependency from umount.ecryptfs
+
 * Fri Apr 16 2010 Michal Hlavinka <mhlavink at redhat.com> - 83-4
 - make salt working together with passwd_file