rpms/ecryptfs-utils/F-10 ecryptfs-mount-private.desktop, NONE, 1.1 .cvsignore, 1.19, 1.20 ecryptfs-utils.spec, 1.32, 1.33 sources, 1.20, 1.21

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9163

Modified Files:
	.cvsignore ecryptfs-utils.spec sources 
Added Files:
	ecryptfs-mount-private.desktop 
Log Message:
- updated to 73
- move libs from /usr/lib to /lib (#486139)
- fix symlinks created by ecryptfs-setup-private (#486146)



--- NEW FILE ecryptfs-mount-private.desktop ---
[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;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	16 Feb 2009 10:29:52 -0000	1.19
+++ .cvsignore	21 Mar 2009 07:30:45 -0000	1.20
@@ -1 +1 @@
-ecryptfs-utils_70.orig.tar.gz
+ecryptfs-utils_73.orig.tar.gz


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ecryptfs-utils.spec	16 Feb 2009 10:29:52 -0000	1.32
+++ ecryptfs-utils.spec	21 Mar 2009 07:30:45 -0000	1.33
@@ -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: 70
+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 @@
 the interface supplied by the ecryptfs-utils library.
 
 %prep
-
 %setup -q
 
 %build
@@ -55,9 +55,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf %{buildroot}%{_libdir}/*.a
-rm -rf %{buildroot}%{_libdir}/*.la
-rm -rf %{buildroot}%{_docdir}/%{name}
+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,24 +81,30 @@
 %{_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
 %{_bindir}/ecryptfs-generate-tpm-key
 %{_bindir}/ecryptfs-mount-private
 %{_bindir}/ecryptfs-setup-private
+%{_bindir}/ecryptfs-setup-swap
 %{_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
@@ -110,7 +119,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libecryptfs.so
+/%{_lib}/libecryptfs.so
 %{_libdir}/pkgconfig/libecryptfs.pc
 %{_includedir}/ecryptfs.h
 
@@ -123,10 +132,14 @@
 %dir %{python_sitearch}/ecryptfs-utils
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so.0
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so.0.0.0
-%{python_sitearch}/ecryptfs-utils/_libecryptfs.la
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Sat Mar 21 2009 Michal Hlavinka <mhlavink at 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 16 2009 Michal Hlavinka <mhlavink at redhat.com> 70-1
 - updated to 70
 - resolves: #480547 - RFE: add umount option to clear per-user keyring


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	16 Feb 2009 10:29:52 -0000	1.20
+++ sources	21 Mar 2009 07:30:45 -0000	1.21
@@ -1 +1 @@
-1131c41046b0736270a3a437fd47aeb7  ecryptfs-utils_70.orig.tar.gz
+8e651749b9d75ee9a4d4894483022857  ecryptfs-utils_73.orig.tar.gz