rpms/ecryptfs-utils/F-12 ecryptfs-utils.spec,1.57,1.58

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/pkgs/rpms/ecryptfs-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13446

Modified Files:
	ecryptfs-utils.spec 
Log Message:
* Wed Jan 27 2010 Michal Hlavinka <mhlavink at redhat.com> - 82-2
- better fix for (#486139)



Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ecryptfs-utils/F-12/ecryptfs-utils.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- ecryptfs-utils.spec	11 Nov 2009 10:54:45 -0000	1.57
+++ ecryptfs-utils.spec	27 Jan 2010 14:16:23 -0000	1.58
@@ -1,9 +1,11 @@
 %{!?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: 82
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -11,15 +13,12 @@ URL: https://launchpad.net/ecryptfs
 Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz
 Source1: ecryptfs-mount-private.png
 
-# fix wrong Makefile for umount.ecryptfs
-Patch2: ecryptfs-utils-74-build.patch
-
 # allow building with -Werror
 # required for ecryptfs-utils <= 81
-Patch4: ecryptfs-utils-75-werror.patch
+Patch1: ecryptfs-utils-75-werror.patch
 
-# rhbz#500829
-Patch6: ecryptfs-utils-75-nocryptdisks.patch
+# rhbz#500829, do not use ubuntu/debian only service
+Patch2: ecryptfs-utils-75-nocryptdisks.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils, cryptsetup-luks, e2fsprogs
@@ -56,13 +55,12 @@ the interface supplied by the ecryptfs-u
 
 %prep
 %setup -q
-%patch2 -p1 -b .build
-%patch4 -p1 -b .werror
-%patch6 -p1 -b .nocryptdisks
+%patch1 -p1 -b .werror
+%patch2 -p1 -b .nocryptdisks
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
-%configure --disable-rpath --enable-tspi --enable-nss --enable-static
+%configure --disable-rpath --enable-tspi --enable-nss
 make clean
 #disable rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -73,8 +71,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT%{_libdir}/ -name '*.a' | xargs rm -f
-find $RPM_BUILD_ROOT%{_libdir}/ -name '*.la' | xargs rm -f
+find $RPM_BUILD_ROOT/ -name '*.la' | xargs rm -f
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 #install files Makefile forgot install
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.png
@@ -107,10 +104,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc README COPYING AUTHORS NEWS THANKS
 %doc doc/ecryptfs-faq.html doc/ecryptfs-pam-doc.txt
 %doc doc/ecryptfs-pkcs11-helper-doc.txt
-/sbin/mount.ecryptfs
-/sbin/umount.ecryptfs
-%attr(4750,root,ecryptfs) /sbin/mount.ecryptfs_private
-/sbin/umount.ecryptfs_private
+%{_sbindir}/mount.ecryptfs
+%{_sbindir}/umount.ecryptfs
+%attr(4750,root,ecryptfs) %{_sbindir}/mount.ecryptfs_private
+%{_sbindir}/umount.ecryptfs_private
 %{_bindir}/ecryptfs-manager
 %{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring
 %{_bindir}/ecryptfs-rewrap-passphrase
@@ -126,9 +123,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ecryptfs-stat
 %{_bindir}/ecryptfsd
 %{_libdir}/ecryptfs
-%{_libdir}/libecryptfs.so.0
-%{_libdir}/libecryptfs.so.0.0.0
-/%{_lib}/security/pam_ecryptfs.so
+%{_libdir}/libecryptfs.so.*
+%{_libdir}/security/pam_ecryptfs.so
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/ecryptfs-mount-private.txt
 %{_datadir}/%{name}/ecryptfs-mount-private.desktop
@@ -173,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Wed Jan 27 2010 Michal Hlavinka <mhlavink at redhat.com> - 82-2
+- better fix for (#486139)
+
 * Wed Nov 11 2009 Michal Hlavinka <mhlavink at redhat.com> - 82-1
 - updated to 82