From 6ae9dcc250b146f3539efea1ef0fe86e289082f5 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Nov 09 2009 16:16:43 +0000
Subject: - fix getext typos (#532732)


---

diff --git a/ecryptfs-utils-81-getext.patch b/ecryptfs-utils-81-getext.patch
new file mode 100644
index 0000000..173ec54
--- /dev/null
+++ b/ecryptfs-utils-81-getext.patch
@@ -0,0 +1,21 @@
+diff -up ecryptfs-utils-81/src/utils/ecryptfs-setup-private.getext ecryptfs-utils-81/src/utils/ecryptfs-setup-private
+--- ecryptfs-utils-81/src/utils/ecryptfs-setup-private.getext	2009-09-18 23:48:39.000000000 +0200
++++ ecryptfs-utils-81/src/utils/ecryptfs-setup-private	2009-11-09 16:48:52.361430492 +0100
+@@ -171,7 +171,7 @@ done
+ # Prompt for the USER name, if not on the command line and not in the env
+ if [ -z "$USER" ]; then
+ 	while [ true ]; do
+-		echo -n gettext `"Enter the username: "`
++		echo -n `gettext "Enter the username: "`
+ 		USER=`head -n1`
+ 		echo
+ 		if [ -z "$USER" ]; then
+@@ -279,7 +279,7 @@ if [ -z "$LOGINPASS" ] && [ "$BOOTSTRAP"
+ 				if printf "%s\0" "$LOGINPASS" | /sbin/unix_chkpwd "$USER" nullok; then
+ 					break
+ 				else
+-					echo `gettext "ERROR:"` `getext "Your login passphrase is incorrect"`
++					echo `gettext "ERROR:"` `gettext "Your login passphrase is incorrect"`
+ 					tries=$(($tries + 1))
+ 				fi
+ 			fi
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 77311c8..bcefacd 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -3,7 +3,7 @@
 
 Name: ecryptfs-utils
 Version: 81
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -11,16 +11,19 @@ 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
+# fix wrong Makefile for umount.ecryptfs
 Patch2: ecryptfs-utils-74-build.patch
 
-#allow building with -Werror
-#required for ecryptfs-utils <= 75
+# allow building with -Werror
+# required for ecryptfs-utils <= 81
 Patch4: ecryptfs-utils-75-werror.patch
 
-#rhbz#500829
+# rhbz#500829
 Patch6: ecryptfs-utils-75-nocryptdisks.patch
 
+# required for ecryptfs-utils <= 81, rhbz#532732
+Patch7: ecryptfs-utils-81-getext.patch
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils, cryptsetup-luks, e2fsprogs
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
@@ -59,6 +62,7 @@ the interface supplied by the ecryptfs-utils library.
 %patch2 -p1 -b .build
 %patch4 -p1 -b .werror
 %patch6 -p1 -b .nocryptdisks
+%patch7 -p1 -b .getext
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
@@ -68,8 +72,6 @@ make clean
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-#remove -Werror flag for swig temporarily (swig is nasty #496613)
-sed -i 's|-Werror||' src/libecryptfs-swig/Makefile
 make %{?_smp_mflags}
 
 %install
@@ -175,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Mon Nov 09 2009 Michal Hlavinka <mhlavink@redhat.com> - 81-2
+- fix getext typos (#532732)
+
 * Tue Sep 29 2009 Michal Hlavinka <mhlavink@redhat.com> - 81-1
 - updated to 81