From e12eec2fd071600dcf4564fbf116f8114786e17c Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Mar 21 2009 07:21:44 +0000
Subject: - updated to 73

- move libs from /usr/lib to /lib (#486139)
- fix symlinks created by ecryptfs-setup-private (#486146)

---

diff --git a/ecryptfs-mount-private.desktop b/ecryptfs-mount-private.desktop
new file mode 100644
index 0000000..087898a
--- /dev/null
+++ b/ecryptfs-mount-private.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Access Your Private Data
+GenericName=Access Your Private Data
+Exec=/usr/bin/ecryptfs-mount-private
+Terminal=true
+Type=Application
+Categories=System;Security;
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 77b89a3..c2e1b73 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -2,17 +2,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 71
+Version: 73
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
 URL: https://launchpad.net/ecryptfs
 Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils_%{version}.orig.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source1: http://bazaar.launchpad.net/%7Eecryptfs/ecryptfs/ecryptfs-utils/annotate/head%3A/src/desktop/ecryptfs-mount-private.desktop
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
-BuildRequires: trousers-devel python python-devel nss-devel
+BuildRequires: trousers-devel python python-devel nss-devel desktop-file-utils
 Conflicts: kernel < 2.6.19
 
 %description
@@ -42,7 +43,6 @@ applications written in the Python programming language to use
 the interface supplied by the ecryptfs-utils library.
 
 %prep
-
 %setup -q
 
 %build
@@ -55,9 +55,12 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 find $RPM_BUILD_ROOT%{_libdir}/ -name '*.la' | xargs rm -f
+mv $RPM_BUILD_ROOT/%{_libdir}/libecryptfs.so* $RPM_BUILD_ROOT/%{_lib}
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+install -D -m 644 doc/ecryptfs-mount-private.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.txt
+desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/%{name} %{SOURCE1}
 
 %post -p /sbin/ldconfig
 
@@ -78,6 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ecryptfs-manager
 %{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring
 %{_bindir}/ecryptfs-rewrap-passphrase
+%{_bindir}/ecryptfs-rewrite-file
 %{_bindir}/ecryptfs-unwrap-passphrase
 %{_bindir}/ecryptfs-wrap-passphrase
 %{_bindir}/ecryptfs-add-passphrase
@@ -88,15 +92,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ecryptfs-umount-private
 %{_bindir}/ecryptfs-stat
 %{_bindir}/ecryptfsd
-%{_libdir}/libecryptfs.so.0.0.0
-%{_libdir}/libecryptfs.so.0
+/%{_lib}/libecryptfs.so.0.0.0
+/%{_lib}/libecryptfs.so.0
 %{_libdir}/ecryptfs
 /%{_lib}/security/pam_ecryptfs.so
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/ecryptfs-mount-private.txt
+%{_datadir}/%{name}/ecryptfs-mount-private.desktop
 %{_mandir}/man1/ecryptfs-add-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-generate-tpm-key.1.gz
 %{_mandir}/man1/ecryptfs-insert-wrapped-passphrase-into-keyring.1.gz
 %{_mandir}/man1/ecryptfs-mount-private.1.gz
 %{_mandir}/man1/ecryptfs-rewrap-passphrase.1.gz
+%{_mandir}/man1/ecryptfs-rewrite-file.1.gz
 %{_mandir}/man1/ecryptfs-setup-private.1.gz
 %{_mandir}/man1/ecryptfs-umount-private.1.gz
 %{_mandir}/man1/ecryptfs-unwrap-passphrase.1.gz
@@ -111,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libecryptfs.so
+/%{_lib}/libecryptfs.so
 %{_libdir}/pkgconfig/libecryptfs.pc
 %{_includedir}/ecryptfs.h
 
@@ -127,6 +135,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Sat Mar 21 2009 Michal Hlavinka <mhlavink@redhat.com> 73-1
+- updated to 73
+- move libs from /usr/lib to /lib (#486139)
+- fix symlinks created by ecryptfs-setup-private (#486146)
+
 * Mon Feb 24 2009 Michal Hlavinka <mhlavink@redhat.com> 71-1
 - updated to 71
 - remove .la files