[cpm] ignore diff result to fix build failure

[Tom Callaway]

commit 0c944b4780379cfe436b3ad3f0926f4d1eb236fd
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Tue May 3 11:58:35 2011 -0400

    ignore diff result to fix build failure

 cpm-0.23beta-ignore-diff-result.patch |   12 ++++++++++++
 cpm.spec                              |    4 +++-
 2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/cpm-0.23beta-ignore-diff-result.patch b/cpm-0.23beta-ignore-diff-result.patch
new file mode 100644
index 0000000..63ec013
--- /dev/null
+++ b/cpm-0.23beta-ignore-diff-result.patch
@@ -0,0 +1,12 @@
+diff -up cpm-0.23beta/Makefile.in.BAD cpm-0.23beta/Makefile.in
+--- cpm-0.23beta/Makefile.in.BAD	2011-05-03 11:49:06.906323055 -0400
++++ cpm-0.23beta/Makefile.in	2011-05-03 11:49:11.422296467 -0400
+@@ -343,7 +343,7 @@ gettext_compile: gettext_translate
+ 	cd po; \
+ 		tail --lines=+18 de_DE.po > current.txt; \
+ 		tail --lines=+18 de_DE_new.po > new.txt; \
+-		diff -u current.txt new.txt
++		diff -u current.txt new.txt || :
+ 	cd po; msgfmt --check --statistics --strict de_DE.po --output=de_DE.mo
+ 	cd po; \
+ 		mkdir -p ./de/LC_MESSAGES; \
diff --git a/cpm.spec b/cpm.spec
index 2b4dfa2..0fb0e1e 100644
--- a/cpm.spec
+++ b/cpm.spec
@@ -1,6 +1,6 @@
 Name:		cpm
 Version:	0.23
-Release:	0.4.beta%{?dist}
+Release:	0.5.beta%{?dist}
 Summary:	Console Password Manager
 
 Group:		Applications/Databases
@@ -12,6 +12,7 @@ Patch0:		cpm-0.23beta-make.patch
 Patch1:		cpm-0.23beta-disclaimer.patch
 Patch2:		cpm-0.23beta-sigint.patch
 Patch3:		cpm-0.23beta-open.patch
+Patch4:		cpm-0.23beta-ignore-diff-result.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cracklib-devel, cracklib-dicts
@@ -38,6 +39,7 @@ the data for some other purpose.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 for file in docs/changelog docs/ChangeLog docs/cpm.txt docs/GPLv2 docs/README; do
 	mv $file timestamp
 	iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp